diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-10-09 09:02:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 09:02:26 +0200 |
| commit | 85e8fd96f4e04184cf22b691ea2229de901f4e4c (patch) | |
| tree | 7c27931728dedf33b7f733175e6c1015d848361c /src/nvim/memline.c | |
| parent | 05cbe0da30fa9455da7d2663e6c5b57876e55fd1 (diff) | |
| parent | f181efdeaf07a788203b60a2df915118eeb6f0fc (diff) | |
| download | rneovim-85e8fd96f4e04184cf22b691ea2229de901f4e4c.tar.gz rneovim-85e8fd96f4e04184cf22b691ea2229de901f4e4c.tar.bz2 rneovim-85e8fd96f4e04184cf22b691ea2229de901f4e4c.zip | |
Merge #9098 'vim-patch:8.1.{459,463,466}'
Diffstat (limited to 'src/nvim/memline.c')
| -rw-r--r-- | src/nvim/memline.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index ec0238e7c9..51f99db0de 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -49,6 +49,7 @@ #include "nvim/buffer.h" #include "nvim/cursor.h" #include "nvim/eval.h" +#include "nvim/getchar.h" #include "nvim/fileio.h" #include "nvim/func_attr.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); if (choice == 0) { - /* Show info about the existing swap file. */ - attention_message(buf, (char_u *) fname); + // Show info about the existing swap file. + attention_message(buf, (char_u *)fname); - /* We don't want a 'q' typed at the more-prompt - * interrupt loading a file. */ - got_int = FALSE; + // We don't want a 'q' typed at the more-prompt + // interrupt loading a file. + got_int = false; + + // If vimrc has "simalt ~x" we don't want it to + // interfere with the prompt here. + flush_buffers(FLUSH_TYPEAHEAD); } if (swap_exists_action != SEA_NONE && choice == 0) { |