vimwiki

commit a036ca54c613131b441d61f423d1dc175a345512
parent ddab77bb8f2febf06cab014eefe9b3b787cb8e94
Author: EinfachToll <istjanichtzufassen@googlemail.com>
Date:   Mon,  3 Mar 2014 09:19:59 +0100

Fix 424: External links with #, % don't work under Linux

Use the additional parameter for shellescape() only for system calls of
the form execute '!...', not for system(...).

Diffstat:
M
autoload/vimwiki/base.vim
 | 
2
+-
M
autoload/vimwiki/html.vim
 | 
14
+++++++-------

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
@@ -472,7 +472,7 @@ function! vimwiki#base#system_open_link(url) "{{{
     execute '!open ' . shellescape(a:url, 1)
   endfunction
   function! s:linux_handler(url)
-    call system('xdg-open ' . shellescape(a:url, 1).' &')
+    call system('xdg-open ' . shellescape(a:url).' &')
   endfunction
   try
     if vimwiki#u#is_windows()
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
@@ -1314,13 +1314,13 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ a:force. ' '.
       \ VimwikiGet('syntax'). ' '.
       \ strpart(VimwikiGet('ext'), 1). ' '.
-      \ shellescape(a:path, 1). ' '.
-      \ shellescape(a:wikifile, 1). ' '.
-      \ shellescape(s:default_CSS_full_name(a:path), 1). ' '.
-      \ (len(VimwikiGet('template_path'))    > 1 ? shellescape(expand(VimwikiGet('template_path')), 1) : '-'). ' '.
-      \ (len(VimwikiGet('template_default')) > 0 ? VimwikiGet('template_default')                      : '-'). ' '.
-      \ (len(VimwikiGet('template_ext'))     > 0 ? VimwikiGet('template_ext')                          : '-'). ' '.
-      \ (len(VimwikiGet('subdir'))           > 0 ? shellescape(s:root_path(VimwikiGet('subdir')), 1)   : '-'))
+      \ shellescape(a:path). ' '.
+      \ shellescape(a:wikifile). ' '.
+      \ shellescape(s:default_CSS_full_name(a:path)). ' '.
+      \ (len(VimwikiGet('template_path'))    > 1 ? shellescape(expand(VimwikiGet('template_path'))) : '-'). ' '.
+      \ (len(VimwikiGet('template_default')) > 0 ? VimwikiGet('template_default')                   : '-'). ' '.
+      \ (len(VimwikiGet('template_ext'))     > 0 ? VimwikiGet('template_ext')                       : '-'). ' '.
+      \ (len(VimwikiGet('subdir'))           > 0 ? shellescape(s:root_path(VimwikiGet('subdir')))   : '-'))
 endfunction " }}}
 
 function! vimwiki#html#Wiki2HTML(path_html, wikifile) "{{{