Mercurial > vim
changeset 14903:c1ee9f32bec3 v8.1.0463
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
commit https://github.com/vim/vim/commit/798184cc67036285a24b38c0bf6668d4d1525548
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 7 20:48:39 2018 +0200
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Problem: "simalt ~x" in .vimrc blocks swap file prompt.
Solution: Flush buffers before prompting. (Yasuhiro Matsumoto,
closes #3518, closes #2192)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 07 Oct 2018 21:00:05 +0200 |
parents | 72fe7891fad8 |
children | 8dd4014f9b98 |
files | src/memline.c src/version.c |
diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -4506,19 +4506,23 @@ findswapname( #endif { #ifdef FEAT_GUI - /* If we are supposed to start the GUI but it wasn't - * completely started yet, start it now. This makes - * the messages displayed in the Vim window when - * loading a session from the .gvimrc file. */ + // If we are supposed to start the GUI but it wasn't + // completely started yet, start it now. This makes + // the messages displayed in the Vim window when + // loading a session from the .gvimrc file. if (gui.starting && !gui.in_use) gui_start(); #endif - /* Show info about the existing swap file. */ + // Show info about the existing swap file. attention_message(buf, fname); - /* We don't want a 'q' typed at the more-prompt - * interrupt loading a file. */ + // 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(TRUE); } #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)