aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

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 #3518, closes #2192)
This commit is contained in:
Bram Moolenaar
2018-10-07 20:48:39 +02:00
parent c0543e145f
commit 798184cc67
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/memline.c
View File

@@ -4506,19 +4506,23 @@ findswapname(
#endif #endif
{ {
#ifdef FEAT_GUI #ifdef FEAT_GUI
/* If we are supposed to start the GUI but it wasn't // If we are supposed to start the GUI but it wasn't
* completely started yet, start it now. This makes // completely started yet, start it now. This makes
* the messages displayed in the Vim window when // the messages displayed in the Vim window when
* loading a session from the .gvimrc file. */ // loading a session from the .gvimrc file.
if (gui.starting && !gui.in_use) if (gui.starting && !gui.in_use)
gui_start(); gui_start();
#endif #endif
/* Show info about the existing swap file. */ // Show info about the existing swap file.
attention_message(buf, fname); attention_message(buf, 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 defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
463,
/**/ /**/
462, 462,
/**/ /**/