Changeset 13e2096

Timestamp:

Nov 7, 2010, 2:26:33 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

cedbe9d

Parents:

bc14adc

git-author:

David Benjamin <davidben@mit.edu> (11/07/10 00:50:19)

git-committer:

David Benjamin <davidben@mit.edu> (11/07/10 14:26:33)

Message:

Remove the echochar hack in owl_command_edit_cancel

owl_function_start_password passes a NULL history, so there
is no need for this. While we're at it, explicitly check for NULL
history in places. While owl_history_* already checks, it's a bit
sketchy.

File:

• commands.c (modified) (3 diffs)

commands.c

@@ -2711 +2711 @@
   owl_function_makemsg("Command cancelled.");
 
-  if(owl_editwin_get_echochar(e) == 0) {
-    hist=owl_editwin_get_history(e);
+  hist = owl_editwin_get_history(e);
+  if (hist) {
     owl_history_store(hist, owl_editwin_get_text(e));
     owl_history_reset(hist);
@@ -2726 +2726 @@
 
   hist=owl_editwin_get_history(e);
+  if (!hist)
+    return;
   if (!owl_history_is_touched(hist)) {
     owl_history_store(hist, owl_editwin_get_text(e));
@@ -2745 +2747 @@
 
   hist=owl_editwin_get_history(e);
+  if (!hist)
+    return;
   ptr=owl_history_get_next(hist);
   if (ptr) {