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

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

View File

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

View File

@ -237,7 +237,7 @@ command! -buffer Vimwiki2HTML
\ let res = vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
\ expand('%'))
\<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
\ silent noautocmd w <bar>
\ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML(