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  <palves@redhat.com>

	* top.c (gdb_rl_operate_and_get_next): Replace max_input_history
	use with history_max_entries use.  Remove FIXME note.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1233bd70a452c9cabbb5246ba1e04335d773acae..bc533bef7a259dbdb7b7de05d0ab7c22c6d1a210 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-26  Pedro Alves  <palves@redhat.com>
+
+       * 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  <markus.t.metzger@intel.com>
 
        * record-btrace.c (record_btrace_close): Call

diff --git a/gdb/top.c b/gdb/top.c
index 7905b518501ce9bac9ee60a2b04bcf2bfbd418f2..645c8989095e62b8aac469aa9d3722cb3350b634 100644 (file)
--- 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;