diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-07 20:48:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-07 20:48:39 +0200 |
| commit | 798184cc67036285a24b38c0bf6668d4d1525548 (patch) | |
| tree | 5023810fbf17cd648251841bd67ff50f65a34c38 | |
| parent | c0543e145fdd29739ac887e71ab96c50282066cd (diff) | |
| download | vim-git-798184cc67036285a24b38c0bf6668d4d1525548.tar.gz | |
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file promptv8.1.0463
Problem: "simalt ~x" in .vimrc blocks swap file prompt.
Solution: Flush buffers before prompting. (Yasuhiro Matsumoto,
closes #3518, closes #2192)
| -rw-r--r-- | src/memline.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/memline.c b/src/memline.c index c06f9571c..f7a3d06a7 100644 --- 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) diff --git a/src/version.c b/src/version.c index 103483a94..90588efd9 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 463, +/**/ 462, /**/ 461, |