aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0042: if omni completion opens a window Insert mode is stopped

Browse Source 
Problem:    If omni completion opens a window Insert mode is stopped.
            (Hirohito Higashi)
Solution:   Only set stop_insert_mode in a prompt buffer window.
This commit is contained in:
Bram Moolenaar
2018-06-10 14:39:52 +02:00
parent e950f9992b
commit f98b845dd1
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -761,6 +761,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 */
/**/
42,
/**/ /**/
41, 41,
/**/ /**/

18
src/window.c
View File

@@ -2107,17 +2107,22 @@ win_equal_rec(
static void static void
leaving_window(win_T *win) leaving_window(win_T *win)
{ {
// Only matters for a prompt window.
if (!bt_prompt(win->w_buffer))
return;
// When leaving a prompt window stop Insert mode and perhaps restart // When leaving a prompt window stop Insert mode and perhaps restart
// it when entering that window again. // it when entering that window again.
win->w_buffer->b_prompt_insert = restart_edit; win->w_buffer->b_prompt_insert = restart_edit;
restart_edit = NUL; restart_edit = NUL;
// When leaving the window (or closing the window) was done from a // When leaving the window (or closing the window) was done from a
// callback we need to break out of the Insert mode loop. // callback we need to break out of the Insert mode loop and restart Insert
// mode when entering the window again.
if (State & INSERT) if (State & INSERT)
{ {
stop_insert_mode = TRUE; stop_insert_mode = TRUE;
if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert == NUL) if (win->w_buffer->b_prompt_insert == NUL)
win->w_buffer->b_prompt_insert = 'A'; win->w_buffer->b_prompt_insert = 'A';
} }
} }
@@ -2125,12 +2130,17 @@ leaving_window(win_T *win)
static void static void
entering_window(win_T *win) entering_window(win_T *win)
{ {
// Only matters for a prompt window.
if (!bt_prompt(win->w_buffer))
return;
// When switching to a prompt buffer that was in Insert mode, don't stop // When switching to a prompt buffer that was in Insert mode, don't stop
// Insert mode, it may have been set in leaving_window(). // Insert mode, it may have been set in leaving_window().
if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert != NUL) if (win->w_buffer->b_prompt_insert != NUL)
stop_insert_mode = FALSE; stop_insert_mode = FALSE;
// When entering the prompt window may restart Insert mode. // When entering the prompt window restart Insert mode if we were in Insert
// mode when we left it.
restart_edit = win->w_buffer->b_prompt_insert; restart_edit = win->w_buffer->b_prompt_insert;
} }
#endif #endif