changeset:   100649:322d30816d36
parent:      100647:c1edc2abbf97
parent:      100648:af6e8e1d15fa
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Mar 22 09:28:58 2016 +0000
files:       Misc/NEWS Modules/readline.c
description:
Issue #24266: Merge readline Ctrl+C handling from 3.5


diff -r c1edc2abbf97 -r 322d30816d36 Misc/NEWS
--- a/Misc/NEWS	Mon Mar 21 22:31:31 2016 -0700
+++ b/Misc/NEWS	Tue Mar 22 09:28:58 2016 +0000
@@ -232,6 +232,9 @@
 Library
 -------
 
+- Issue #24266: Ctrl+C during Readline history search now cancels the search
+  mode when compiled with Readline 7.
+
 - Issue #26590: Implement a safe finalizer for the _socket.socket type. It now
   releases the GIL to close the socket.
 
diff -r c1edc2abbf97 -r 322d30816d36 Modules/readline.c
--- a/Modules/readline.c	Mon Mar 21 22:31:31 2016 -0700
+++ b/Modules/readline.c	Tue Mar 22 09:28:58 2016 +0000
@@ -1138,6 +1138,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;