From 95e30c706bba3ebedcc19b81bf5cd3d9847cdf26 Mon Sep 17 00:00:00 2001
From: Camil Staps <info@camilstaps.nl>
Date: Tue, 11 Aug 2015 09:53:30 +0200
Subject: [PATCH 1/3] Fixes #212. Fix pdflatex substitution to work with
 Latexmk's 'internal' keyword

---
 autoload/vimtex/latexmk.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/vimtex/latexmk.vim b/autoload/vimtex/latexmk.vim
index 66f925d..1411cc3 100644
--- a/autoload/vimtex/latexmk.vim
+++ b/autoload/vimtex/latexmk.vim
@@ -384,7 +384,7 @@ function! s:latexmk_build_cmd() " {{{1
 
   let cmd .= ' ' . g:vimtex_latexmk_options
   let cmd .= ' -e ' . vimtex#util#shellescape(
-        \ '$pdflatex =~ s/ / -file-line-error /')
+        \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /')
   if g:vimtex_latexmk_build_dir !=# ''
     let cmd .= ' -outdir=' . g:vimtex_latexmk_build_dir
   endif

From ee1178d3efa42da70245924dcf8cbe0cc17cfc09 Mon Sep 17 00:00:00 2001
From: Camil Staps <info@camilstaps.nl>
Date: Tue, 11 Aug 2015 11:34:28 +0200
Subject: [PATCH 2/3] Something shady with escaping the exclamation mark...

---
 autoload/vimtex/latexmk.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/vimtex/latexmk.vim b/autoload/vimtex/latexmk.vim
index 1411cc3..8bfbc3b 100644
--- a/autoload/vimtex/latexmk.vim
+++ b/autoload/vimtex/latexmk.vim
@@ -383,8 +383,8 @@ function! s:latexmk_build_cmd() " {{{1
   endif
 
   let cmd .= ' ' . g:vimtex_latexmk_options
-  let cmd .= ' -e ' . vimtex#util#shellescape(
-        \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /')
+  let cmd .= ' -e ' . shellescape(
+        \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /', 1)
   if g:vimtex_latexmk_build_dir !=# ''
     let cmd .= ' -outdir=' . g:vimtex_latexmk_build_dir
   endif

From 41f0eccdc0b9f3cb80e5246dfe07f646d3aa0768 Mon Sep 17 00:00:00 2001
From: Camil Staps <info@camilstaps.nl>
Date: Wed, 26 Aug 2015 11:26:43 +0200
Subject: [PATCH 3/3] Changing back to vimtex#util#shellescape

---
 autoload/vimtex/latexmk.vim | 4 ++--
 autoload/vimtex/util.vim    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/autoload/vimtex/latexmk.vim b/autoload/vimtex/latexmk.vim
index cfaf78c..f9f1148 100644
--- a/autoload/vimtex/latexmk.vim
+++ b/autoload/vimtex/latexmk.vim
@@ -383,8 +383,8 @@ function! s:latexmk_build_cmd() " {{{1
   endif
 
   let cmd .= ' ' . g:vimtex_latexmk_options
-  let cmd .= ' -e ' . shellescape(
-        \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /', 1)
+  let cmd .= ' -e ' . vimtex#util#shellescape(
+        \ '$pdflatex =~ s/^((.(?<!^internal(?=\s)))*?) /$1 -file-line-error /')
   if g:vimtex_latexmk_build_dir !=# ''
     let cmd .= ' -outdir=' . g:vimtex_latexmk_build_dir
   endif
diff --git a/autoload/vimtex/util.vim b/autoload/vimtex/util.vim
index 27b56bd..db1c0ea 100644
--- a/autoload/vimtex/util.vim
+++ b/autoload/vimtex/util.vim
@@ -123,7 +123,7 @@ endfunction
 function! vimtex#util#shellescape(path) " {{{1
   " Blackslashes in path must be escaped to be correctly parsed by the
   " substitute() function.
-  let l:path = escape(a:path, '\')
+  let l:path = has('win32') ? escape(a:path, '\') : a:path
 
   "
   " In a Windows environment, a path used in "cmd" only needs to be enclosed by
@@ -132,7 +132,7 @@ function! vimtex#util#shellescape(path) " {{{1
   " reports an error.  Any path that goes into vimtex#util#execute() should be
   " processed through this function.
   "
-  return has('win32') ? '"' . l:path . '"' : shellescape(l:path)
+  return has('win32') ? '"' . l:path . '"' : shellescape(l:path, 1)
 endfunction
 
 " }}}1