vimwiki

commit fb5ea2886b6e8ef763128a97feb1005d4486e33b
parent 24d690f32dd7b88dfb24ae9e36207f31345a0119
Author: EinfachToll <istjanichtzufassen@googlemail.com>
Date:   Thu, 16 Oct 2014 11:42:38 +0200

Merge remote-tracking branch 'patrickdavey/check_for_binary' into dev

Diffstat:
M
autoload/vimwiki/html.vim
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
@@ -1308,7 +1308,7 @@ endfunction " }}}
 
 function! s:use_custom_wiki2html() "{{{
   let custom_wiki2html = VimwikiGet('custom_wiki2html')
-  return !empty(custom_wiki2html) && s:file_exists(custom_wiki2html)
+  return !empty(custom_wiki2html) && (s:file_exists(custom_wiki2html) || s:binary_exists(custom_wiki2html))
 endfunction " }}}
 
 function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
@@ -1538,6 +1538,10 @@ function! s:file_exists(fname) "{{{
   return !empty(getftype(expand(a:fname)))
 endfunction "}}}
 
+function! s:binary_exists(fname) "{{{
+  return executable(expand(a:fname))
+endfunction "}}}
+
 " uses VimwikiGet('path')
 function! vimwiki#html#get_wikifile_url(wikifile) "{{{
   return VimwikiGet('path_html').