Merge branch 'master' into math-mappings

after/syntax/tex.vim

@@ -11,6 +11,13 @@ elseif b:current_syntax !=# 'tex'
   finish
 endif
 
+" {{{1 Add conceal for \emph
+if has('conceal') && get(g:, 'tex_conceal', 'b') =~# 'b'
+  syntax region texItalStyle
+        \ matchgroup=texTypeStyle start="\\emph\s*{" end="}" concealends
+endif
+
+" }}}1
 " {{{1 Add syntax highlighting for \url and \href
 syntax match texStatement '\\url\ze[^\ta-zA-Z]' nextgroup=texUrlVerb
 syntax match texStatement '\\url\ze\s*{' nextgroup=texUrl

autoload/vimtex/latexmk.vim

@@ -12,7 +12,7 @@ function! vimtex#latexmk#init_options() " {{{1
   call vimtex#util#set_default('g:vimtex_latexmk_background', 0)
   call vimtex#util#set_default('g:vimtex_latexmk_callback', 1)
   call vimtex#util#set_default('g:vimtex_latexmk_continuous', 1)
-  call vimtex#util#set_default('g:vimtex_latexmk_options', '-pdf')
+  call vimtex#util#set_default('g:vimtex_latexmk_options', '')
   call vimtex#util#set_default('g:vimtex_latexmk_progname',
         \ get(v:, 'progpath', get(v:, 'progname')))
   call vimtex#util#set_default('g:vimtex_quickfix_autojump', '0')
@@ -382,7 +382,7 @@ function! s:latexmk_build_cmd() " {{{1
     endif
   endif
 
-  let cmd .= ' ' . g:vimtex_latexmk_options
+  let cmd .= ' -verbose -pdf ' . g:vimtex_latexmk_options
   let cmd .= ' -e ' . vimtex#util#shellescape(
         \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /')
   if g:vimtex_latexmk_build_dir !=# ''

compiler/latexmk.vim

@@ -4,8 +4,8 @@
 " Email:      karl.yngve@gmail.com
 "
 
-if exists("current_compiler") | finish | endif
+if exists('current_compiler') | finish | endif
-let current_compiler = "latexmk"
+let current_compiler = 'latexmk'
 
 CompilerSet makeprg=""
 
@@ -30,8 +30,8 @@ CompilerSet errorformat+=%Z<argument>\ %m
 CompilerSet errorformat+=%Cl.%l\ %m
 
 " Show warnings
-if exists("g:vimtex_quickfix_ignore_all_warnings")
+if exists('g:vimtex_quickfix_ignore_all_warnings')
-      \ && exists("g:vimtex_quickfix_ignored_warnings")
+      \ && exists('g:vimtex_quickfix_ignored_warnings')
       \ && !g:vimtex_quickfix_ignore_all_warnings
   " Ignore some warnings
   for w in g:vimtex_quickfix_ignored_warnings
@@ -41,6 +41,7 @@ if exists("g:vimtex_quickfix_ignore_all_warnings")
   CompilerSet errorformat+=%+WLaTeX\ %.%#Warning:\ %.%#line\ %l%.%#
   CompilerSet errorformat+=%+W%.%#\ at\ lines\ %l--%*\\d
   CompilerSet errorformat+=%+WLaTeX\ %.%#Warning:\ %m
+  CompilerSet errorformat+=%+WPackage\ natbib\ Warning:\ %m\ on\ input\ line\ %l%.
   CompilerSet errorformat+=%+W%.%#%.%#Warning:\ %m
 
   " Parse biblatex warnings

test/issue-232/vimrc

@@ -0,0 +1,29 @@
+set nocompatible
+let &rtp = '~/.vim/bundle/vimtex,' . &rtp
+let &rtp = '~/.vim/bundle/neocomplete,' . &rtp
+filetype plugin indent on
+syntax enable
+
+set encoding=utf-8
+set hidden
+set backspace=2
+
+if has('conceal')
+  set conceallevel=2 concealcursor=niv
+endif
+
+let g:neocomplete#enable_at_startup = 1
+let g:neocomplete#enable_camel_case = 1
+let g:neocomplete#enable_auto_delimiter = 1
+let g:neocomplete#enable_auto_close_preview = 1
+
+let g:neocomplete#keyword_patterns = {}
+let g:neocomplete#sources#omni#input_patterns = {}
+
+let g:neocomplete#keyword_patterns.tex     = '[a-zA-ZæÆøØåÅ][0-9a-zA-ZæÆøØåÅ]\+'
+let g:neocomplete#sources#omni#input_patterns.tex =
+      \ '\v\\\a*(ref|cite)\a*([^]]*\])?\{([^}]*,)*[^}]*'
+
+silent edit ~/.vim/bundle/vimtex/test/test-completions/main.tex
+silent normal! zRgg7jo
+startinsert