summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-24 22:11:55 +0200
committerVictor Stinner <victor.stinner@gmail.com>2014-07-24 22:11:55 +0200
commit31f1a360b8aa3b80c0f23ce0d3dee592d1afefd9 (patch)
tree0176aca235e3d77b9455455c53b3c9ef68d0d6f1
parentd18ccd19f0a197746e48b0a2fa128f8b06f2168d (diff)
parent92639cce354ecb52db6179c3edcf90012096f345 (diff)
downloadcpython-git-31f1a360b8aa3b80c0f23ce0d3dee592d1afefd9.tar.gz
(Merge 3.4) Issue #19884, readline: calling rl_variable_bind
("enable-meta-key", "off") does crash on Mac OS X which uses libedit instead of readline.
-rw-r--r--Modules/readline.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index d72e51518f..ae838079e3 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1020,15 +1020,19 @@ setup_readline(readlinestate *mod_state)
mod_state->begidx = PyLong_FromLong(0L);
mod_state->endidx = PyLong_FromLong(0L);
+#ifndef __APPLE__
if (!isatty(STDOUT_FILENO)) {
/* Issue #19884: stdout is no a terminal. Disable meta modifier
keys to not write the ANSI sequence "\033[1034h" into stdout. On
terminals supporting 8 bit characters like TERM=xterm-256color
(which is now the default Fedora since Fedora 18), the meta key is
used to enable support of 8 bit characters (ANSI sequence
- "\033[1034h"). */
+ "\033[1034h").
+
+ With libedit, this call makes readline() crash. */
rl_variable_bind ("enable-meta-key", "off");
}
+#endif
/* Initialize (allows .inputrc to override)
*