From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 20 Aug 2014 22:30:40 +0000 (-0500)
Subject: Backed out changeset 7c19f1f792c6
X-Git-Tag: v2.7.9rc1~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b47b54c7f8fc804f61a36361757aa5763cbaea51;p=thirdparty%2FPython%2Fcpython.git

Backed out changeset 7c19f1f792c6
---

diff --git a/Modules/readline.c b/Modules/readline.c
index 7c573a11bfe1..20a16c505103 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)