Changeset 1c01cdf7 for commands.c

Timestamp:

Jun 25, 2011, 2:29:50 AM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

8b293ea (diff), 2bc6bb16 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2bc6bb1631398bd9cd2eaeee9ed91c2a15649b30 into 8b293ea82bfdae7cddf0e0665ef6eca1cc0df04d

File:

• commands.c (modified) (5 diffs)

commands.c

@@ -2632 +2632 @@
   ptr = skiptokens(buff, 1);
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
-  owl_history_reset(hist);
+  owl_history_store(hist, ptr, false);
   /* owl_function_makemsg("History '%s' stored successfully", ptr+1); */
   return NULL;
@@ -2655 +2654 @@
 
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
-  owl_history_reset(hist);
+  owl_history_store(hist, ptr, false);
   return owl_function_command(ptr);
 }
@@ -2739 +2737 @@
 
   hist = owl_editwin_get_history(e);
-  if (hist) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
+  if (hist)
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   owl_global_pop_context(&g);
@@ -2755 +2751 @@
   if (!hist)
     return;
-  if (!owl_history_is_touched(hist)) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_set_partial(hist);
-  }
+  if (!owl_history_is_touched(hist))
+    owl_history_store(hist, owl_editwin_get_text(e), true);
   ptr=owl_history_get_prev(hist);
   if (ptr) {
@@ -2796 +2790 @@
   owl_history *hist=owl_editwin_get_history(e);
 
-  if (hist) {
-    owl_history_store(hist, owl_editwin_get_text(e));
-    owl_history_reset(hist);
-  }
+  if (hist)
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   /* Take a reference to the editwin, so that it survives the pop