*** empty log message ***

3 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a16402..a745445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2004-11-02  Shawn Betts  <katia_dilkina@verizon.net>
+2004-11-03  Shawn Betts  <sabetts@vcn.bc.ca>
+
+	* src/input.c (get_more_input): call history_reset
+
+	* src/history.c (history_load): remove call to using_history.
+	(history_save): likewise
+	(history_add): likewise
+
+2004-11-02  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* src/split.c (blank_frame): use the frames screen, not the current screen.
 
@@ -11,11 +19,11 @@
 	* src/window.c (find_window_other): add argument, the screen to
 	find the window in. All callers updated.
 
-2004-10-29  Shawn Betts  <katia_dilkina@verizon.net>
+2004-10-29  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* contrib/rpws: remove the echo /tmp/boom line.
 
-2004-10-28  Shawn Betts  <katia_dilkina@verizon.net>
+2004-10-28  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* src/actions.c (set_padding): fix the padding order in xsprintf.
 
diff --git a/src/history.c b/src/history.c
index a96c296..668d9c4 100644
--- a/src/history.c
+++ b/src/history.c
@@ -35,8 +35,6 @@ history_load ()
   if (filename && read_history (filename) != 0)
     PRINT_DEBUG (("ratpoison: could not read %s - %s\n", filename, strerror (errno)));
 
-  using_history();
-
   free (filename);
 }
 
@@ -45,8 +43,6 @@ history_save ()
 {
   char *filename = get_history_filename ();
 
-  using_history ();
-
   if (filename && write_history (filename) != 0)
     PRINT_ERROR (("ratpoison: could not write %s - %s\n", filename, strerror (errno)));
 
@@ -75,7 +71,6 @@ history_add (char *item)
 
   PRINT_DEBUG (("Adding item: %s\n", item));
   add_history (item);
-  using_history();
 }
 
 char *
diff --git a/src/input.c b/src/input.c
index b9ecd4c..626acad 100644
--- a/src/input.c
+++ b/src/input.c
@@ -426,6 +426,10 @@ get_more_input (char *prompt, char *preinput,
   char *final_input;
   edit_status status;
 
+#ifdef HAVE_READLINE_HISTORY_H
+  history_reset();
+#endif /* HAVE_READLINE_HISTORY_H */
+
   /* Create our line structure */
   line = input_line_new (prompt, preinput, compl_fn);