changeset:   100648:af6e8e1d15fa
branch:      3.5
parent:      100646:4784717cb254
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Mar 22 07:24:05 2016 +0000
files:       Misc/NEWS Modules/readline.c
description:
Issue #24266: Cancel history search mode with Ctrl+C in Readline 7


diff -r 4784717cb254 -r af6e8e1d15fa Misc/NEWS
--- a/Misc/NEWS	Mon Mar 21 22:31:24 2016 -0700
+++ b/Misc/NEWS	Tue Mar 22 07:24:05 2016 +0000
@@ -94,6 +94,9 @@
 Library
 -------
 
+- Issue #24266: Ctrl+C during Readline history search now cancels the search
+  mode when compiled with Readline 7.
+
 - Issue #26560: Avoid potential ValueError in BaseHandler.start_response.
   Initial patch by Peter Inglesby.
 
diff -r 4784717cb254 -r af6e8e1d15fa Modules/readline.c
--- a/Modules/readline.c	Mon Mar 21 22:31:24 2016 -0700
+++ b/Modules/readline.c	Tue Mar 22 07:24:05 2016 +0000
@@ -1140,6 +1140,9 @@
 #endif
             if (s < 0) {
                 rl_free_line_state();
+#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0700
+                rl_callback_sigcleanup();
+#endif
                 rl_cleanup_after_signal();
                 rl_callback_handler_remove();
                 *signal = 1;