summaryrefslogtreecommitdiff
path: root/Modules/readline.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-08-20 17:30:40 -0500
committerBenjamin Peterson <benjamin@python.org>2014-08-20 17:30:40 -0500
commitb47b54c7f8fc804f61a36361757aa5763cbaea51 (patch)
tree00210e8a08ad522d933706ffe4206ca3e0a9f73b /Modules/readline.c
parent64c1215b5dc283484311f1ca0794977c3d8bdc90 (diff)
downloadcpython-git-b47b54c7f8fc804f61a36361757aa5763cbaea51.tar.gz
Backed out changeset 7c19f1f792c6
Diffstat (limited to 'Modules/readline.c')
-rw-r--r--Modules/readline.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/readline.c b/Modules/readline.c
index 7c573a11bf..20a16c5051 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -933,15 +933,19 @@ setup_readline(void)
begidx = PyInt_FromLong(0L);
endidx = PyInt_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)
*
@@ -953,7 +957,6 @@ setup_readline(void)
rl_read_init_file(NULL);
else
#endif /* __APPLE__ */
- if (isatty(STDOUT_FILENO))
rl_initialize();
RESTORE_LOCALE(saved_locale)