]> granicus.if.org Git - python/commitdiff
Merged revisions 75533 via svnmerge from
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 19 Oct 2009 18:24:35 +0000 (18:24 +0000)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 19 Oct 2009 18:24:35 +0000 (18:24 +0000)
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.
  ........
................

Misc/NEWS
Modules/readline.c

index fb799a630f5f6beadd5b87c27e1578c0175e0618..2f00c3e4afdebb3d0d3336ff39e8ac98ce30f66b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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
index 8925d8da004c42ccfebc33f13121b0195eef0c99..2ca91fd8ba7270a5374f4b02b94b5584f413438c 100644 (file)
@@ -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);