# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1570269604 -7200
# Node ID 9e696b8fee7db259be615169541c59c50105033b
# Parent  545afb8a920735e13c783b9ac335459cd71df9ac
patch 8.1.2114: when a popup is closed with CTRL-C the callback aborts

Commit: https://github.com/vim/vim/commit/fd00c042afc40539447e798aadbd0a2219fdbdc1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Oct 5 11:56:54 2019 +0200

    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 https://github.com/vim/vim/issues/5008)

diff --git a/src/popupwin.c b/src/popupwin.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2114,
+/**/
     2113,
 /**/
     2112,