To: vim_dev@googlegroups.com
Subject: Patch 8.1.2114
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.2114
Problem:    When a popup is closed with CTRL-C the callback aborts.
Solution:   Reset got_int when invoking the callback. (closes #5008)
Files:	    src/popupwin.c


*** ../vim-8.1.2113/src/popupwin.c	2019-10-02 23:06:41.553528656 +0200
--- src/popupwin.c	2019-10-05 11:56:37.362467967 +0200
***************
*** 2763,2769 ****
--- 2763,2774 ----
      // 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;
      }
  
*** ../vim-8.1.2113/src/version.c	2019-10-05 11:30:04.975429899 +0200
--- src/version.c	2019-10-05 11:55:19.126790602 +0200
***************
*** 755,756 ****
--- 755,758 ----
  {   /* Add new patch number below this line */
+ /**/
+     2114,
  /**/

-- 
ARTHUR: Did you say shrubberies?
ROGER:  Yes.  Shrubberies are my trade.  I am a shrubber.  My name is Roger
        the Shrubber.  I arrange, design, and sell shrubberies.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///