Changeset 0d17295

Timestamp:

Mar 23, 2010, 5:23:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

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

Children:

d83621c4

Parents:

38cc669

git-author:

Nelson Elhage <nelhage@mit.edu> (03/14/10 00:02:34)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Merge editresponse:done and edit:done into a single command.

Files:

• commands.c (modified) (3 diffs)
• functions.c (modified) (1 diff)

commands.c

@@ -911 +911 @@
                   "", ""),
 
-  OWLCMD_VOID_CTX("editresponse:done", owl_command_editresponse_done, 
-                  OWL_CTX_EDITRESPONSE,
-                  "completes the response to a question",
-                  "", ""),
+  OWLCMD_ALIAS   ("editresponse:done", "edit:done"),
 
   OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up, 
@@ -927 +924 @@
 
   OWLCMD_VOID_CTX("edit:done", owl_command_edit_done, 
-                  OWL_CTX_EDITMULTI,
-                  "completes the command (eg, sends message being composed)",
+                  OWL_CTX_EDIT,
+                  "Finishes entering text in the editwin.",
                   "", ""),
 
@@ -2775 +2772 @@
 }
 
-
-void owl_command_editresponse_done(owl_editwin *e)
-{
-  owl_function_run_buffercommand();
-
-  owl_global_set_typwin_inactive(&g);
-  owl_global_pop_context(&g);
-
-  owl_global_set_needrefresh(&g);
-}
-
-
 void owl_command_edit_done(owl_editwin *e)
 {
   owl_history *hist=owl_editwin_get_history(e);
 
-  owl_history_store(hist, owl_editwin_get_text(e));
-  owl_history_reset(hist);
+  if (hist) {
+    owl_history_store(hist, owl_editwin_get_text(e));
+    owl_history_reset(hist);
+  }
 
   owl_function_run_buffercommand();

functions.c

@@ -1940 +1940 @@
   owl_editwin *tw;
 
-  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, owl_global_get_cmd_history(&g));
+  owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_ONELINE, NULL);
   tw = owl_global_get_typwin(&g);
   owl_editwin_set_echochar(tw, '*');