Changeset 10b866d for commands.c

Timestamp:

Jul 8, 2002, 10:37:21 PM (22 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

e1c4636

Parents:

8df36cc

Message:

* Fixed preservation of e->dotsend across owl_editwin_clear().

* Added history for multiline edit windows (eg, for zephyr composition).
  The M-n and M-p keys will cycle through the history ring.
  In particular, it is now possible to edit the command line
  of a zephyr being composed:  C-c it and restart it
  and then M-p to get the aborted composition back.

File:

• commands.c (modified) (6 diffs)

commands.c

@@ -593 +593 @@
 
   OWLCMD_VOID_CTX("edit:history-next", owl_command_edit_history_next, 
-                  OWL_CTX_EDITLINE,
+                  OWL_CTX_EDIT,
                   "replaces the text with the previous history",
                   "", ""),
 
   OWLCMD_VOID_CTX("edit:history-prev", owl_command_edit_history_prev, 
-                  OWL_CTX_EDITLINE,
+                  OWL_CTX_EDIT,
                   "replaces the text with the previous history",
                   "", ""),
@@ -1478 +1478 @@
 
 void owl_command_edit_cancel(owl_editwin *e) {
+  owl_history *hist;
+
   owl_function_makemsg("Command cancelled.");
+
+  hist=owl_editwin_get_history(e);
+  owl_history_store(hist, owl_editwin_get_text(e));
+  owl_history_reset(hist);
+
   owl_editwin_fullclear(e);
   owl_global_set_needrefresh(&g);
   wnoutrefresh(owl_editwin_get_curswin(e));
   owl_global_set_typwin_inactive(&g);
-  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE, NULL);
 }
 
@@ -1490 +1497 @@
   char *ptr;
 
-  hist=owl_global_get_history(&g);
+  hist=owl_editwin_get_history(e);
   if (!owl_history_is_touched(hist)) {
     owl_history_store(hist, owl_editwin_get_text(e));
@@ -1510 +1517 @@
   char *ptr;
 
-  hist=owl_global_get_history(&g);
+  hist=owl_editwin_get_history(e);
   ptr=owl_history_get_next(hist);
   if (ptr) {
@@ -1531 +1538 @@
 
 void owl_command_editline_done(owl_editwin *e) {
-  owl_history *hist=owl_global_get_history(&g);
+  owl_history *hist=owl_editwin_get_history(e);
   char *rv, *cmd;
 
-  owl_global_set_typwin_inactive(&g);
   owl_history_store(hist, owl_editwin_get_text(e));
   owl_history_reset(hist);
+  owl_global_set_typwin_inactive(&g);
   cmd = owl_strdup(owl_editwin_get_text(e));
   owl_editwin_fullclear(e);
@@ -1552 +1559 @@
 
 void owl_command_editmulti_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);
+
   owl_function_run_buffercommand();
-  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE);
+  owl_editwin_new_style(e, OWL_EDITWIN_STYLE_ONELINE, NULL);
   owl_editwin_fullclear(e);
   owl_global_set_typwin_inactive(&g);