[2/8] Remove gdb workaround from readline/complete.c

Message ID 20190806204334.13441-3-tom@tromey.com
State New
Headers show
Series
  • Upgrade readline
Related show

Commit Message

Tom Tromey Aug. 6, 2019, 8:43 p.m.
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.

2018-10-07  Tom Tromey  <tom@tromey.com>

	* complete.c (get_y_or_n): Remove gdb workaround.
---
 readline/ChangeLog.gdb | 4 ++++
 readline/complete.c    | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

-- 
2.17.2

Patch

diff --git a/readline/complete.c b/readline/complete.c
index ac54d76a255..0a81129b877 100644
--- a/readline/complete.c
+++ b/readline/complete.c
@@ -528,17 +528,12 @@  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. */
 #if defined (READLINE_CALLBACKS)
   if (RL_ISSTATE (RL_STATE_CALLBACK))
     return 1;
-#endif
 #endif
 
   for (;;)