Changeset 8df36cc

Timestamp:

Jul 3, 2002, 6:56:07 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:

10b866d

Parents:

217a43e

Message:

	Fixed a bug in the "reply -e" command (for real this time).
	Always clear the command buffer before executing the command.
	        (So that interactive commands can sanely do start-command.)

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)

ChangeLog

@@ -21 +21 @@
         The "Not logged in or subscribing to messages" error 
                 now includes the name of the recipient.
-        Fixed a bug in the "reply -e" command.
         The "disable-ctrl-d" variable may also be set to "middle"
                 which will result in ctrl-d only sending at the 
                 end of the message.  This is now the default.
                 This also added a command "editmulti:done-or-delete".
-                
+        Fixed a bug in the "reply -e" command.
+        Always clear the command buffer before executing the command.
+                (So that interactive commands can sanely do start-command.)
+
 1.2.1-pre-1
         Added RCS Id strings to all files.

commands.c

@@ -1151 +1151 @@
   int edit=0;
   
-  if (argc==2 && !strcmp("-e", argv[1])) {
+  if (argc>=2 && !strcmp("-e", argv[1])) {
     edit=1;
     argv++;
@@ -1532 +1532 @@
 void owl_command_editline_done(owl_editwin *e) {
   owl_history *hist=owl_global_get_history(&g);
-  char *rv;
+  char *rv, *cmd;
 
   owl_global_set_typwin_inactive(&g);
   owl_history_store(hist, owl_editwin_get_text(e));
   owl_history_reset(hist);
-  rv = owl_function_command(owl_editwin_get_text(e));
-  
-  /* if we're still in ONELINE mode we can clear the buffer */
-  if (owl_editwin_get_style(e)==OWL_EDITWIN_STYLE_ONELINE) {
-    owl_editwin_fullclear(e);
-  }
- 
+  cmd = owl_strdup(owl_editwin_get_text(e));
+  owl_editwin_fullclear(e);
+  rv = owl_function_command(cmd);
+  owl_free(cmd);
+
   wnoutrefresh(owl_editwin_get_curswin(e));
   owl_global_set_needrefresh(&g);