Imported from ../bash-2.05b.tar.gz.

[thirdparty/bash.git] / lib / readline / history.c

diff --git a/lib/readline/history.c b/lib/readline/history.c
index e2d65ea504de46a9b04d7f99b21d325ce696f5ed..4242f33efe19e05dd120ec0aa9c2bc8946f49943 100644 (file)
--- a/lib/readline/history.c
+++ b/lib/readline/history.c
@@ -44,12 +44,6 @@
 #  include <unistd.h>
 #endif
 
-#if defined (HAVE_STRING_H)
-#  include <string.h>
-#else
-#  include <strings.h>
-#endif /* !HAVE_STRING_H */
-
 #include "history.h"
 #include "histlib.h"
 
@@ -349,19 +343,19 @@ stifle_history (max)
   max_input_history = history_max_entries = max;
 }
 
-/* Stop stifling the history.  This returns the previous amount the 
-   history was stifled by.  The value is positive if the history was
-   stifled,  negative if it wasn't. */
+/* Stop stifling the history.  This returns the previous maximum
+   number of history entries.  The value is positive if the history
+   was stifled,  negative if it wasn't. */
 int
 unstifle_history ()
 {
   if (history_stifled)
     {
       history_stifled = 0;
-      return (-history_max_entries);
+      return (history_max_entries);
     }
-
-  return (history_max_entries);
+  else
+    return (-history_max_entries);
 }
 
 int