From 57a2fe070226852b84eff8f37e49b367daa2a32f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 7 Oct 2018 15:24:12 -0600 Subject: [PATCH] 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 * complete.c (get_y_or_n): Remove gdb workaround. --- readline/ChangeLog.gdb | 4 ++++ readline/complete.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb index fb53dc6..7125d4d 100644 --- a/readline/ChangeLog.gdb +++ b/readline/ChangeLog.gdb @@ -1,5 +1,9 @@ 2019-08-12 Tom Tromey + * complete.c (get_y_or_n): Remove gdb workaround. + +2018-08-12 Tom Tromey + * Imported readline 7.0 patch 5. 2019-07-12 Tom de Vries diff --git a/readline/complete.c b/readline/complete.c index ac54d76..0a81129 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 (;;) { -- 2.7.4