Changeset b470451

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:

8e515f9

Parents:

ad37b39

git-author:

Anders Kaseorg <andersk@mit.edu> (06/22/11 03:04:01)

git-committer:

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

Message:

history: Tell owl_history_store whether the new entry will be partial

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

Files:

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

commands.c

@@ -2632 +2632 @@
   ptr = skiptokens(buff, 1);
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
+  owl_history_store(hist, ptr, false);
   /* owl_function_makemsg("History '%s' stored successfully", ptr+1); */
   return NULL;
@@ -2654 +2654 @@
 
   hist = owl_global_get_cmd_history(&g);
-  owl_history_store(hist, ptr);
+  owl_history_store(hist, ptr, false);
   return owl_function_command(ptr);
 }
@@ -2738 +2738 @@
   hist = owl_editwin_get_history(e);
   if (hist)
-    owl_history_store(hist, owl_editwin_get_text(e));
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   owl_global_pop_context(&g);
@@ -2751 +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) {
@@ -2793 +2791 @@
 
   if (hist)
-    owl_history_store(hist, owl_editwin_get_text(e));
+    owl_history_store(hist, owl_editwin_get_text(e), false);
 
   /* Take a reference to the editwin, so that it survives the pop

functions.c

@@ -1841 +1841 @@
     if (enter) {
       owl_history *hist = owl_global_get_cmd_history(&g);
-      owl_history_store(hist, buff);
+      owl_history_store(hist, buff, false);
       owl_function_command_norv(buff);
     } else {

history.c

@@ -5 +5 @@
   owl_list_create(&(h->hist));
   h->cur=0;                     /* current position in history */
-  h->partial=0;                 /* is the 0th element is partially composed? */
+  h->partial = false;           /* is the 0th element is partially composed? */
 }
 
@@ -36 +36 @@
 }
 
-void owl_history_store(owl_history *h, const char *line)
+void owl_history_store(owl_history *h, const char *line, bool partial)
 {
   int size;
@@ -58 +58 @@
   /* add the new line */
   owl_list_prepend_element(&(h->hist), g_strdup(line));
-}
-
-void owl_history_set_partial(owl_history *h)
-{
-  if (!h) return;
-  h->partial=1;
+  h->partial = partial;
 }
 
@@ -74 +69 @@
     g_free(owl_list_get_element(&(h->hist), 0));
     owl_list_remove_element(&(h->hist), 0);
-    h->partial = 0;
+    h->partial = false;
   }
 

owl.h

@@ -457 +457 @@
   owl_list hist;
   int cur;
-  int partial;
+  bool partial;
 } owl_history;