summaryrefslogtreecommitdiff
path: root/readline
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-10-07 15:24:12 -0600
committerTom Tromey <tom@tromey.com>2019-08-12 10:57:56 -0600
commit57a2fe070226852b84eff8f37e49b367daa2a32f (patch)
tree89ff9bfca43b11b4f0731e17a607adacb10ad2ee /readline
parent775e241e9c5f2b2ff2b59972ab70e5f20763fae6 (diff)
downloadbinutils-gdb-57a2fe070226852b84eff8f37e49b367daa2a32f.tar.gz
Remove gdb workaround from readline/complete.c
This removes a gdb-local patch from readline's get_y_or_n. The code references a gdb test that continues to work when I remove this patch. So, I think it is not needed any more. readline/ChangeLog.gdb 2018-10-07 Tom Tromey <tom@tromey.com> * complete.c (get_y_or_n): Remove gdb workaround.
Diffstat (limited to 'readline')
-rw-r--r--readline/ChangeLog.gdb4
-rw-r--r--readline/complete.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index fb53dc604cc..7125d4d43fb 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,5 +1,9 @@
2019-08-12 Tom Tromey <tom@tromey.com>
+ * complete.c (get_y_or_n): Remove gdb workaround.
+
+2018-08-12 Tom Tromey <tom@tromey.com>
+
* Imported readline 7.0 patch 5.
2019-07-12 Tom de Vries <tdevries@suse.de>
diff --git a/readline/complete.c b/readline/complete.c
index ac54d76a255..0a81129b877 100644
--- a/readline/complete.c
+++ b/readline/complete.c
@@ -528,10 +528,6 @@ get_y_or_n (for_pager)
{
int c;
-/* Disabled for GDB due to the gdb.base/readline-ask.exp regression.
- [patch] testsuite: Test readline-6.2 "ask" regression
- http://sourceware.org/ml/gdb-patches/2011-05/msg00002.html */
-#if 0
/* For now, disable pager in callback mode, until we later convert to state
driven functions. Have to wait until next major version to add new
state definition, since it will change value of RL_STATE_DONE. */
@@ -539,7 +535,6 @@ get_y_or_n (for_pager)
if (RL_ISSTATE (RL_STATE_CALLBACK))
return 1;
#endif
-#endif
for (;;)
{