Changeset 83a079a

Timestamp:

Jun 25, 2011, 3:24:36 AM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

ad37b39

Parents:

9923144

git-author:

Anders Kaseorg <andersk@mit.edu> (06/22/11 02:54:44)

git-committer:

Anders Kaseorg <andersk@mit.edu> (06/25/11 03:24:36)

Message:

history: Make owl_history_store also reset

It doesn’t make sense to run owl_history_store without
owl_history_reset (except in one case where we know the current
position is already the beginning and we’re about to
owl_history_set_partial), so let’s merge these functions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• commands.c (modified) (4 diffs)
• functions.c (modified) (1 diff)
• history.c (modified) (1 diff)

commands.c

@@ -2633 +2633 @@
   hist = owl_global_get_cmd_history(&g);
   owl_history_store(hist, ptr);
-  owl_history_reset(hist);
   /* owl_function_makemsg("History '%s' stored successfully", ptr+1); */
   return NULL;
@@ -2656 +2655 @@
   hist = owl_global_get_cmd_history(&g);
   owl_history_store(hist, ptr);
-  owl_history_reset(hist);
   return owl_function_command(ptr);
 }
@@ -2739 +2737 @@
 
   hist = owl_editwin_get_history(e);
-  if (hist) {
+  if (hist)
     owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
 
   owl_global_pop_context(&g);
@@ -2796 +2792 @@
   owl_history *hist=owl_editwin_get_history(e);
 
-  if (hist) {
+  if (hist)
     owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
 
   /* Take a reference to the editwin, so that it survives the pop

functions.c

@@ -1842 +1842 @@
       owl_history *hist = owl_global_get_cmd_history(&g);
       owl_history_store(hist, buff);
-      owl_history_reset(hist);
       owl_function_command_norv(buff);
     } else {

history.c

@@ -49 +49 @@
   }
 
+  owl_history_reset(h);
+
   /* check if the line is the same as the last */
   if (owl_list_get_size(&(h->hist))>0) {