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

Merge remote-tracking branch 'chelmertz/dev-echo-export-location' into dev

Browse Source 
Conflicts:
	ftplugin/vimwiki.vim
This commit is contained in:
EinfachToll 2014-09-12 12:09:40 +02:00
commit fb8bbef69b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/vimwiki/html.vim
View File

@ -1528,6 +1528,7 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
call VimwikiSet('invsubdir', current_invsubdir) call VimwikiSet('invsubdir', current_invsubdir)
call s:create_default_CSS(path_html) call s:create_default_CSS(path_html)
echomsg 'HTML exported to '.path_html
echomsg 'Done!' echomsg 'Done!'
let &more = setting_more let &more = setting_more

2
ftplugin/vimwiki.vim
View File

@ -237,7 +237,7 @@ command! -buffer Vimwiki2HTML
\ let res = vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')), \ let res = vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
\ expand('%')) \ expand('%'))
\<bar> \<bar>
\ if res != '' | echo 'Vimwiki: HTML conversion is done.' | endif \ if res != '' | echo 'Vimwiki: HTML conversion is done, output: '.expand(VimwikiGet('path_html')) | endif
command! -buffer Vimwiki2HTMLBrowse command! -buffer Vimwiki2HTMLBrowse
\ silent noautocmd w <bar> \ silent noautocmd w <bar>
\ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML( \ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML(