Skip to content

Commit d9ff74e

Browse files
pitroupitrou
committed
Some platforms have rl_completion_append_character but not rl_completion_suppress_append.
Reported by Mark D.
1 parent c1bdf89 commit d9ff74e

4 files changed

Lines changed: 43 additions & 15 deletions

File tree

‎Modules/readline.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,8 @@ flex_complete(char *text, int start, int end)
803803
{
804804
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
805805
rl_completion_append_character ='\0';
806+
#endif
807+
#ifdef HAVE_RL_COMPLETION_SUPPRESS_APPEND
806808
rl_completion_suppress_append = 0;
807809
#endif
808810
Py_XDECREF(begidx);

‎configure‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 75658 .
2+
# From configure.in Revision: 75664 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 2.7.
55
#
@@ -3865,7 +3865,7 @@ else
38653865
{ echo "$as_me:$LINENO: result: no" >&5
38663866
echo "${ECHO_T}no" >&6; }
38673867
fi
3868-
rm -f -r conftest*
3868+
rm -f conftest*
38693869

38703870

38713871

@@ -5422,7 +5422,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
54225422
else
54235423
ac_cv_header_stdc=no
54245424
fi
5425-
rm -f -r conftest*
5425+
rm -f conftest*
54265426

54275427
fi
54285428

@@ -5443,7 +5443,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
54435443
else
54445444
ac_cv_header_stdc=no
54455445
fi
5446-
rm -f -r conftest*
5446+
rm -f conftest*
54475447

54485448
fi
54495449

@@ -6541,7 +6541,7 @@ _ACEOF
65416541

65426542

65436543
fi
6544-
rm -f -r conftest*
6544+
rm -f conftest*
65456545

65466546
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
65476547
echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7071,7 +7071,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
70717071
else
70727072
ac_cv_type_uid_t=no
70737073
fi
7074-
rm -f -r conftest*
7074+
rm -f conftest*
70757075

70767076
fi
70777077
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -15731,7 +15731,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1573115731
else
1573215732
unistd_defines_pthreads=no
1573315733
fi
15734-
rm -f -r conftest*
15734+
rm -f conftest*
1573515735

1573615736
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
1573715737
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -17345,7 +17345,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1734517345
$EGREP "yes" >/dev/null 2>&1; then
1734617346
ipv6type=$i
1734717347
fi
17348-
rm -f -r conftest*
17348+
rm -f conftest*
1734917349

1735017350
;;
1735117351
kame)
@@ -17368,7 +17368,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1736817368
ipv6libdir=/usr/local/v6/lib
1736917369
ipv6trylibc=yes
1737017370
fi
17371-
rm -f -r conftest*
17371+
rm -f conftest*
1737217372

1737317373
;;
1737417374
linux-glibc)
@@ -17389,7 +17389,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1738917389
ipv6type=$i;
1739017390
ipv6trylibc=yes
1739117391
fi
17392-
rm -f -r conftest*
17392+
rm -f conftest*
1739317393

1739417394
;;
1739517395
linux-inet6)
@@ -17427,7 +17427,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1742717427
ipv6lib=inet6;
1742817428
ipv6libdir=/usr/local/v6/lib
1742917429
fi
17430-
rm -f -r conftest*
17430+
rm -f conftest*
1743117431

1743217432
;;
1743317433
v6d)
@@ -17450,7 +17450,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1745017450
ipv6libdir=/usr/local/v6/lib;
1745117451
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
1745217452
fi
17453-
rm -f -r conftest*
17453+
rm -f conftest*
1745417454

1745517455
;;
1745617456
zeta)
@@ -17472,7 +17472,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1747217472
ipv6lib=inet6;
1747317473
ipv6libdir=/usr/local/v6/lib
1747417474
fi
17475-
rm -f -r conftest*
17475+
rm -f conftest*
1747617476

1747717477
;;
1747817478
esac
@@ -25580,7 +25580,26 @@ cat >>confdefs.h <<\_ACEOF
2558025580
_ACEOF
2558125581

2558225582
fi
25583-
rm -f -r conftest*
25583+
rm -f conftest*
25584+
25585+
cat >conftest.$ac_ext <<_ACEOF
25586+
/* confdefs.h. */
25587+
_ACEOF
25588+
cat confdefs.h >>conftest.$ac_ext
25589+
cat >>conftest.$ac_ext <<_ACEOF
25590+
/* end confdefs.h. */
25591+
#include <readline/readline.h>
25592+
25593+
_ACEOF
25594+
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
25595+
$EGREP "extern int rl_completion_suppress_append;" >/dev/null 2>&1; then
25596+
25597+
cat >>confdefs.h <<\_ACEOF
25598+
#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1
25599+
_ACEOF
25600+
25601+
fi
25602+
rm -f conftest*
2558425603

2558525604
fi
2558625605

@@ -25850,7 +25869,7 @@ cat >>confdefs.h <<\_ACEOF
2585025869
_ACEOF
2585125870

2585225871
fi
25853-
rm -f -r conftest*
25872+
rm -f conftest*
2585425873

2585525874
fi
2585625875

‎configure.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3674,6 +3674,10 @@ then
36743674
[readline/readline.h],
36753675
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
36763676
[Define if you have readline 2.2]), )
3677+
AC_EGREP_HEADER([extern int rl_completion_suppress_append;],
3678+
[readline/readline.h],
3679+
AC_DEFINE(HAVE_RL_COMPLETION_SUPPRESS_APPEND, 1,
3680+
[Define if you have rl_completion_suppress_append]), )
36773681
fi
36783682

36793683
# check for readline 4.0

‎pyconfig.h.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,9 @@
529529
/* Define if you have readline 4.2 */
530530
#undef HAVE_RL_COMPLETION_MATCHES
531531

532+
/* Define if you have rl_completion_suppress_append */
533+
#undef HAVE_RL_COMPLETION_SUPPRESS_APPEND
534+
532535
/* Define if you have readline 4.0 */
533536
#undef HAVE_RL_PRE_INPUT_HOOK
534537

0 commit comments

Comments
 (0)