From 1fb2e2b56901690331720448836755a4eee944c7 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 26 Mar 2013 16:47:02 +0000 Subject: [PATCH] Use readline's 'history_max_entries' instead of the old 'max_input_history'. Ref: http://www.sourceware.org/ml/gdb-patches/2002-08/msg00486.html We've long since imported a newer readline, no need to use the old compatibility variable anymore. Tested on x86_64 Fedora 17. gdb/ 2013-03-26 Pedro Alves * top.c (gdb_rl_operate_and_get_next): Replace max_input_history use with history_max_entries use. Remove FIXME note. --- gdb/ChangeLog | 5 +++++ gdb/top.c | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1233bd70a4..bc533bef7a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-03-26 Pedro Alves + + * top.c (gdb_rl_operate_and_get_next): Replace max_input_history + use with history_max_entries use. Remove FIXME note. + 2013-03-26 Markus Metzger * record-btrace.c (record_btrace_close): Call diff --git a/gdb/top.c b/gdb/top.c index 7905b51850..645c898909 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -876,13 +876,8 @@ gdb_rl_operate_and_get_next (int count, int key) /* Find the current line, and find the next line to use. */ where = where_history(); - /* FIXME: kettenis/20020817: max_input_history is renamed into - history_max_entries in readline-4.2. When we do a new readline - import, we should probably change it here too, even though - readline maintains backwards compatibility for now by still - defining max_input_history. */ - if ((history_is_stifled () && (history_length >= max_input_history)) || - (where >= history_length - 1)) + if ((history_is_stifled () && (history_length >= history_max_entries)) + || (where >= history_length - 1)) operate_saved_history = where; else operate_saved_history = where + 1;