thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1963: popup window filter may be called recursively

Browse Source 
Problem:    Popup window filter may be called recursively when using a Normal
            mode command.
Solution:   Prevent recursiveness. (closes #4887)  Also restore KeyTyped.
This commit is contained in:
Bram Moolenaar
2019-09-01 23:27:05 +02:00
parent 55008aad50
commit 934470e562
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/popupwin.c
View File

@@ -2764,8 +2764,14 @@ invoke_popup_filter(win_T *wp, int c)
int
popup_do_filter(int c)
{
static int recursive = FALSE;
int res = FALSE;
win_T *wp;
int save_KeyTyped = KeyTyped;
if (recursive)
return FALSE;
recursive = TRUE;
popup_reset_handled();
@@ -2776,13 +2782,15 @@ popup_do_filter(int c)
wp = mouse_find_win(&row, &col, FIND_POPUP);
if (wp != NULL && popup_close_if_on_X(wp, row, col))
return TRUE;
res = TRUE;
}
while (!res && (wp = find_next_popup(FALSE)) != NULL)
if (wp->w_filter_cb.cb_name != NULL)
res = invoke_popup_filter(wp, c);
recursive = FALSE;
KeyTyped = save_KeyTyped;
return res;
}