Changeset 435d6b2

Timestamp:

Jul 17, 2009, 10:42:58 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

b4ef908

Parents:

2f2a643

Message:

Rename 'editmulti:' commands to 'edit:'.

Files:

• commands.c (modified) (4 diffs)
• editwin.c (modified) (1 diff)
• keys.c (modified) (2 diffs)

commands.c

@@ -916 +916 @@
                   "", ""),
 
-  OWLCMD_VOID_CTX("editmulti:move-up-line", owl_editwin_key_up, 
+  OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up, 
                   OWL_CTX_EDITMULTI,
                   "moves the cursor up one line",
                   "", ""),
 
-  OWLCMD_VOID_CTX("editmulti:move-down-line", owl_editwin_key_down, 
+  OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down, 
                   OWL_CTX_EDITMULTI,
                   "moves the cursor down one line",
                   "", ""),
 
-  OWLCMD_VOID_CTX("editmulti:done", owl_command_editmulti_done, 
+  OWLCMD_VOID_CTX("edit:done", owl_command_edit_done, 
                   OWL_CTX_EDITMULTI,
                   "completes the command (eg, sends message being composed)",
                   "", ""),
 
-  OWLCMD_VOID_CTX("editmulti:done-or-delete", owl_command_editmulti_done_or_delete, 
+  OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete, 
                   OWL_CTX_EDITMULTI,
                   "completes the command, but only if at end of message",
                   "", 
                   "If only whitespace is to the right of the cursor,\n"
-                  "runs 'editmulti:done'.\n"\
+                  "runs 'edit:done'.\n"\
                   "Otherwise runs 'edit:delete-next-char'\n"),
 
-  OWLCMD_VOID_CTX("editmulti:forward-paragraph", owl_editwin_forward_paragraph,
+  OWLCMD_VOID_CTX("edit:forward-paragraph", owl_editwin_forward_paragraph,
                   OWL_CTX_EDITMULTI,
                   "Move forward to end of paragraph.",
@@ -945 +945 @@
                   "Move the point to the end of the current paragraph"),
 
-  OWLCMD_VOID_CTX("editmulti:backward-paragraph", owl_editwin_backward_paragraph,
+  OWLCMD_VOID_CTX("edit:backward-paragraph", owl_editwin_backward_paragraph,
                   OWL_CTX_EDITMULTI,
                   "Move backward to the start of paragraph.",
@@ -2791 +2791 @@
 
 
-void owl_command_editmulti_done(owl_editwin *e)
+void owl_command_edit_done(owl_editwin *e)
 {
   owl_history *hist=owl_editwin_get_history(e);
@@ -2806 +2806 @@
 }
 
-void owl_command_editmulti_done_or_delete(owl_editwin *e)
+void owl_command_edit_done_or_delete(owl_editwin *e)
 {
   if (owl_editwin_is_at_end(e)) {
-    owl_command_editmulti_done(e);
+    owl_command_edit_done(e);
   } else {
     owl_editwin_delete_char(e);

editwin.c

@@ -1220 +1220 @@
   /* XXX force a redisplay? */
   if ((j.ch==13 || j.ch==10) && owl_editwin_check_dotsend(e)) {
-    owl_command_editmulti_done(e);
+    owl_command_edit_done(e);
     return;
   }

keys.c

@@ -103 +103 @@
   owl_keymap_set_submap(km_ew_multi, km_editwin);
 
-  BIND_CMD("UP",      "editmulti:move-up-line", "");
-  BIND_CMD("M-[ A",   "editmulti:move-up-line", "");
-  BIND_CMD("C-p",     "editmulti:move-up-line", "");
-  BIND_CMD("DOWN",    "editmulti:move-down-line", "");
-  BIND_CMD("M-[ B",   "editmulti:move-down-line", "");
-  BIND_CMD("C-n",     "editmulti:move-down-line", "");
-
-  BIND_CMD("M-}",     "editmulti:forward-paragraph", "");
-  BIND_CMD("M-{",     "editmulti:backward-paragraph", "");
+  BIND_CMD("UP",      "edit:move-up-line", "");
+  BIND_CMD("M-[ A",   "edit:move-up-line", "");
+  BIND_CMD("C-p",     "edit:move-up-line", "");
+  BIND_CMD("DOWN",    "edit:move-down-line", "");
+  BIND_CMD("M-[ B",   "edit:move-down-line", "");
+  BIND_CMD("C-n",     "edit:move-down-line", "");
+
+  BIND_CMD("M-}",     "edit:forward-paragraph", "");
+  BIND_CMD("M-{",     "edit:backward-paragraph", "");
 
   /* This would be nice, but interferes with C-c to cancel */
-  /*BIND_CMD("C-c C-c", "editmulti:done", "sends the zephyr");*/
+  /*BIND_CMD("C-c C-c", "edit:done", "sends the zephyr");*/
 
   BIND_CMD("M-p",         "edit:history-prev", "");
@@ -121 +121 @@
   /* note that changing "disable-ctrl-d" to "on" will change this to 
    * edit:delete-next-char */
-  BIND_CMD("C-d",     "editmulti:done-or-delete", "sends the zephyr if at the end of the message");
+  BIND_CMD("C-d",     "edit:done-or-delete", "sends the zephyr if at the end of the message");