IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt

Browse Source 
Problem:    "simalt ~x" in .vimrc blocks swap file prompt.
Solution:   Flush buffers before prompting. (Yasuhiro Matsumoto,
            closes vim/vim#3518, closes vim/vim#2192)
798184cc67
This commit is contained in:
Jan Edmund Lazo 2018-10-08 17:11:47 -04:00
parent c64d6702e5
commit 573567aef6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/memline.c
View File

@ -49,6 +49,7 @@
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/eval.h" #include "nvim/eval.h"
#include "nvim/getchar.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/func_attr.h" #include "nvim/func_attr.h"
#include "nvim/main.h" #include "nvim/main.h"
@ -3358,12 +3359,16 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
choice = do_swapexists(buf, (char_u *) fname); choice = do_swapexists(buf, (char_u *) fname);
if (choice == 0) { if (choice == 0) {
/* Show info about the existing swap file. */ // Show info about the existing swap file.
attention_message(buf, (char_u *) fname); attention_message(buf, (char_u *) fname);
/* We don't want a 'q' typed at the more-prompt // We don't want a 'q' typed at the more-prompt
* interrupt loading a file. */ // interrupt loading a file.
got_int = FALSE; got_int = FALSE;
// If vimrc has "simalt ~x" we don't want it to
// interfere with the prompt here.
flush_buffers(TRUE);
} }
if (swap_exists_action != SEA_NONE && choice == 0) { if (swap_exists_action != SEA_NONE && choice == 0) {