Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 75725 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75725 | antoine.pitrou | 2009-10-26 20:16:46 +0100 (lun., 26 oct. 2009) | 4 lines

  Some platforms have rl_completion_append_character but not rl_completion_suppress_append.
  Reported by Mark D.
........
This commit is contained in:
Antoine Pitrou 2009-10-26 19:22:14 +00:00
parent 47312acfdb
commit d51317709b
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/readline.c
View File

@ -802,6 +802,8 @@ flex_complete(char *text, int start, int end)
{ {
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rl_completion_append_character ='\0'; rl_completion_append_character ='\0';
#endif
#ifdef HAVE_RL_COMPLETION_SUPPRESS_APPEND
rl_completion_suppress_append = 0; rl_completion_suppress_append = 0;
#endif #endif
Py_XDECREF(begidx); Py_XDECREF(begidx);

21
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 75678 . # From configure.in Revision: 75684 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2. # Generated by GNU Autoconf 2.61 for python 3.2.
# #
@ -25053,6 +25053,25 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1 #define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
_ACEOF _ACEOF
fi
rm -f conftest*
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <readline/readline.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "extern int rl_completion_suppress_append;" >/dev/null 2>&1; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1
_ACEOF
fi fi
rm -f conftest* rm -f conftest*

4
configure.in
View File

@ -3528,6 +3528,10 @@ then
[readline/readline.h], [readline/readline.h],
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1, AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
[Define if you have readline 2.2]), ) [Define if you have readline 2.2]), )
AC_EGREP_HEADER([extern int rl_completion_suppress_append;],
[readline/readline.h],
AC_DEFINE(HAVE_RL_COMPLETION_SUPPRESS_APPEND, 1,
[Define if you have rl_completion_suppress_append]), )
fi fi
# check for readline 4.0 # check for readline 4.0

3
pyconfig.h.in
View File

@ -533,6 +533,9 @@
/* Define if you have readline 4.2 */ /* Define if you have readline 4.2 */
#undef HAVE_RL_COMPLETION_MATCHES #undef HAVE_RL_COMPLETION_MATCHES
/* Define if you have rl_completion_suppress_append */
#undef HAVE_RL_COMPLETION_SUPPRESS_APPEND
/* Define if you have readline 4.0 */ /* Define if you have readline 4.0 */
#undef HAVE_RL_PRE_INPUT_HOOK #undef HAVE_RL_PRE_INPUT_HOOK