commit b997e687c3e34c1451d8573a23d91dfe6b4122c5
parent 6ec85cd0e82f66799d456080de326027b547d98d
Author: Rane Brown <ranebrown@users.noreply.github.com>
Date: Wed, 5 Jun 2019 06:04:41 -0600
Merge pull request #698 from jpmor/dev
Remove awa check triggering silent file edits.
Diffstat:
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
@@ -826,22 +826,16 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...)
" This hack is necessary because apparently Vim messes up the result of
" getpos() directly after this command. Strange.
if !(a:command ==# ':e ' && vimwiki#path#is_equal(a:filename, expand('%:p')))
- if &autowriteall && !&hidden " in this case, the file is saved before switching to the
- " new buffer. This causes Vim to show two messages in the command line which triggers
- " the annoying hit-enter prompt. Solution: show no messages at all.
- silent execute a:command fname
- else
- try
- execute a:command fname
- catch /E37:/
- echomsg 'Vimwiki: Can''t leave the current buffer, because it is modified. Hint: Take a look at'
- \ ''':h g:vimwiki_autowriteall'' to see how to save automatically.'
- return
- catch /E325:/
- echom 'Vimwiki: Vim couldn''t open the file, probably because a swapfile already exists. See :h E325.'
- return
- endtry
- endif
+ try
+ execute a:command fname
+ catch /E37:/
+ echomsg 'Vimwiki: Can''t leave the current buffer, because it is modified. Hint: Take a look at'
+ \ ''':h g:vimwiki_autowriteall'' to see how to save automatically.'
+ return
+ catch /E325:/
+ echom 'Vimwiki: Vim couldn''t open the file, probably because a swapfile already exists. See :h E325.'
+ return
+ endtry
" If the opened file was not already loaded by Vim, an autocommand is
" triggered at this point
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
@@ -3511,6 +3511,7 @@ New:~
* PR #47: Optimize table formatting for large tables.
Removed:~
+ * PR #698: Remove awa check triggering silent file edits.
* Options g:vimwiki_use_mouse and g:vimwiki_table_mappings. These are
still present in the code for backwards compatibility but have been
removed from the documentation and will be fully removed at a later
