From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Oct 2019 09:56:54 +0000 (+0200)
Subject: patch 8.1.2114: when a popup is closed with CTRL-C the callback aborts
X-Git-Tag: v8.1.2114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd00c042afc40539447e798aadbd0a2219fdbdc1;p=vim

patch 8.1.2114: when a popup is closed with CTRL-C the callback aborts

Problem:    When a popup is closed with CTRL-C the callback aborts.
Solution:   Reset got_int when invoking the callback. (closes #5008)
---

diff --git a/src/popupwin.c b/src/popupwin.c
index 06812073e..6b0b383b0 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2763,7 +2763,12 @@ invoke_popup_filter(win_T *wp, int c)
     // Emergency exit: CTRL-C closes the popup.
     if (c == Ctrl_C)
     {
+	int save_got_int = got_int;
+
+	// Reset got_int to avoid the callback isn't called.
+	got_int = FALSE;
 	popup_close_with_retval(wp, -1);
+	got_int |= save_got_int;
 	return 1;
     }
 
diff --git a/src/version.c b/src/version.c
index d37ee657d..0673d7e78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2114,
 /**/
     2113,
 /**/