y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
EinfachToll 2014-10-16 11:42:38 +02:00
commit fb5ea2886b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/vimwiki/html.vim
View File

@ -1308,7 +1308,7 @@ endfunction " }}}
function! s:use_custom_wiki2html() "{{{ function! s:use_custom_wiki2html() "{{{
let custom_wiki2html = VimwikiGet('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 " }}} endfunction " }}}
function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
@ -1538,6 +1538,10 @@ function! s:file_exists(fname) "{{{
return !empty(getftype(expand(a:fname))) return !empty(getftype(expand(a:fname)))
endfunction "}}} endfunction "}}}
function! s:binary_exists(fname) "{{{
return executable(expand(a:fname))
endfunction "}}}
" uses VimwikiGet('path') " uses VimwikiGet('path')
function! vimwiki#html#get_wikifile_url(wikifile) "{{{ function! vimwiki#html#get_wikifile_url(wikifile) "{{{
return VimwikiGet('path_html'). return VimwikiGet('path_html').