diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-08-27 04:03:26 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-08-27 04:03:26 +0000 |
| commit | aac9b716329e74f35f981769f1c831f4dfb4b51e (patch) | |
| tree | 129f6f568659cb1f572f57d26722aaa9f1061ac3 /Modules | |
| parent | ef91bb26604ddfae22aac56b3cfdaabf237db37a (diff) | |
| parent | c427b8d517469005d53128e9656213a3ec141890 (diff) | |
| download | cpython-git-aac9b716329e74f35f981769f1c831f4dfb4b51e.tar.gz | |
Issue #19884: Merge Readline updates from 3.5
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/readline.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/Modules/readline.c b/Modules/readline.c index f8876e0560..0d483d7c2e 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1146,19 +1146,22 @@ 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 not 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"). - - With libedit, this call makes readline() crash. */ - rl_variable_bind ("enable-meta-key", "off"); - } +#ifdef __APPLE__ + if (!using_libedit_emulation) #endif + { + if (!isatty(STDOUT_FILENO)) { + /* Issue #19884: stdout is not 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"). + + With libedit, this call makes readline() crash. */ + rl_variable_bind ("enable-meta-key", "off"); + } + } /* Initialize (allows .inputrc to override) * |