Changeset 5a9f6fe

Timestamp:

Nov 5, 2003, 10:48:32 AM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

cb78880

Parents:

3c7d007a

Message:

Command history now doesn't allow the most recent entry to be repeated
If format_msg returns "" print "<unformatted message>"

Files:

• ChangeLog (modified) (1 diff)
• global.c (modified) (1 diff)
• history.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• style.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
+
+2.0.13-pre-4
+        Command history now doesn't allow the last entry
+           to be repeated
+        If format_msg returns "" print "<unformatted message>"
 
 2.0.12-pre-3

global.c

@@ -75 +75 @@
   owl_history_init(&(g->msghist));
   owl_history_init(&(g->cmdhist));
-  /* owl_history_set_norepeats(&(g->cmdhist)); */
+  owl_history_set_norepeats(&(g->cmdhist));
   g->nextmsgid=0;
 

history.c

@@ -53 +53 @@
   size=owl_list_get_size(&(h->hist));
 
-  /* if repeats are disallowed, check if the line is present already */
-  if (!h->repeats) {
-    for (i=0; i<size; i++) {
-      if (!strcmp(line, owl_list_get_element(&(h->hist), i))) return;
-    }
-  }
-
   /* if partial is set, remove the first entry first */
   if (h->partial) {
     owl_list_remove_element(&(h->hist), 0);
+  }
+
+  /* if repeats are disallowed, check if the line is the same as the last */
+  if (owl_list_get_size(&(h->hist))>0) {
+    if (!strcmp(line, owl_list_get_element(&(h->hist), 0))) return;
   }
 

owl.h

@@ -19 +19 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.12-pre-3
-#define OWL_VERSION_STRING "2.0.12-pre-3"
+#define OWL_VERSION         2.0.12-pre-4
+#define OWL_VERSION_STRING "2.0.12-pre-4"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

style.c

@@ -59 +59 @@
     /* run the perl function */
     body=owl_perlconfig_getmsg(m, 1, s->perlfuncname);
+    if (!strcmp(body, "")) {
+      owl_free(body);
+      body=owl_strdup("<unformatted message>");
+    }
     
     /* indent and ensure ends with a newline */