diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 18:24:35 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-19 18:24:35 (GMT) |
| commit | e566bda297f21edfac9ba2557f702be08868b66d (patch) | |
| tree | d385b947037600d379a1897424ca94bf4c3d682c | |
| parent | aaf85ce859a11bb8b54e8640dc2b1e7ccaee53e5 (diff) | |
| download | cpython-e566bda297f21edfac9ba2557f702be08868b66d.zip cpython-e566bda297f21edfac9ba2557f702be08868b66d.tar.gz cpython-e566bda297f21edfac9ba2557f702be08868b66d.tar.bz2 | |
Merged revisions 75533 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75533 | antoine.pitrou | 2009-10-19 20:22:37 +0200 (lun., 19 oct. 2009) | 14 lines
Merged revisions 75531-75532 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75531 | antoine.pitrou | 2009-10-19 20:17:18 +0200 (lun., 19 oct. 2009) | 4 lines
Issue #5833: Fix extra space character in readline completion with the
GNU readline library version 6.0.
........
r75532 | antoine.pitrou | 2009-10-19 20:20:21 +0200 (lun., 19 oct. 2009) | 3 lines
NEWS entry for r75531.
........
................
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/readline.c | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -30,6 +30,9 @@ Core and Builtins Library ------- +- Issue #5833: Fix extra space character in readline completion with the + GNU readline library version 6.0. + - Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment - Issue #7082: When falling back to the MIME 'name' parameter, the diff --git a/Modules/readline.c b/Modules/readline.c index 8925d8d..2ca91fd 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -758,6 +758,10 @@ on_completion(const char *text, int state) static char ** flex_complete(char *text, int start, int end) { +#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character ='\0'; + rl_completion_suppress_append = 0; +#endif Py_XDECREF(begidx); Py_XDECREF(endidx); begidx = PyLong_FromLong((long) start); @@ -800,9 +804,6 @@ setup_readline(void) rl_completer_word_break_characters = strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); /* All nonalphanums except '.' */ -#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER - rl_completion_append_character ='\0'; -#endif begidx = PyLong_FromLong(0L); endidx = PyLong_FromLong(0L); |