Changeset 435d6b2


Ignore:
Timestamp:
Jul 17, 2009, 10:42:58 PM (8 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, 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:
3 edited

Legend:

Unmodified
Added
Removed
  • commands.c

    r2fc8397 r435d6b2  
    916916                  "", ""),
    917917
    918   OWLCMD_VOID_CTX("editmulti:move-up-line", owl_editwin_key_up,
     918  OWLCMD_VOID_CTX("edit:move-up-line", owl_editwin_key_up,
    919919                  OWL_CTX_EDITMULTI,
    920920                  "moves the cursor up one line",
    921921                  "", ""),
    922922
    923   OWLCMD_VOID_CTX("editmulti:move-down-line", owl_editwin_key_down,
     923  OWLCMD_VOID_CTX("edit:move-down-line", owl_editwin_key_down,
    924924                  OWL_CTX_EDITMULTI,
    925925                  "moves the cursor down one line",
    926926                  "", ""),
    927927
    928   OWLCMD_VOID_CTX("editmulti:done", owl_command_editmulti_done,
     928  OWLCMD_VOID_CTX("edit:done", owl_command_edit_done,
    929929                  OWL_CTX_EDITMULTI,
    930930                  "completes the command (eg, sends message being composed)",
    931931                  "", ""),
    932932
    933   OWLCMD_VOID_CTX("editmulti:done-or-delete", owl_command_editmulti_done_or_delete,
     933  OWLCMD_VOID_CTX("edit:done-or-delete", owl_command_edit_done_or_delete,
    934934                  OWL_CTX_EDITMULTI,
    935935                  "completes the command, but only if at end of message",
    936936                  "",
    937937                  "If only whitespace is to the right of the cursor,\n"
    938                   "runs 'editmulti:done'.\n"\
     938                  "runs 'edit:done'.\n"\
    939939                  "Otherwise runs 'edit:delete-next-char'\n"),
    940940
    941   OWLCMD_VOID_CTX("editmulti:forward-paragraph", owl_editwin_forward_paragraph,
     941  OWLCMD_VOID_CTX("edit:forward-paragraph", owl_editwin_forward_paragraph,
    942942                  OWL_CTX_EDITMULTI,
    943943                  "Move forward to end of paragraph.",
     
    945945                  "Move the point to the end of the current paragraph"),
    946946
    947   OWLCMD_VOID_CTX("editmulti:backward-paragraph", owl_editwin_backward_paragraph,
     947  OWLCMD_VOID_CTX("edit:backward-paragraph", owl_editwin_backward_paragraph,
    948948                  OWL_CTX_EDITMULTI,
    949949                  "Move backward to the start of paragraph.",
     
    27912791
    27922792
    2793 void owl_command_editmulti_done(owl_editwin *e)
     2793void owl_command_edit_done(owl_editwin *e)
    27942794{
    27952795  owl_history *hist=owl_editwin_get_history(e);
     
    28062806}
    28072807
    2808 void owl_command_editmulti_done_or_delete(owl_editwin *e)
     2808void owl_command_edit_done_or_delete(owl_editwin *e)
    28092809{
    28102810  if (owl_editwin_is_at_end(e)) {
    2811     owl_command_editmulti_done(e);
     2811    owl_command_edit_done(e);
    28122812  } else {
    28132813    owl_editwin_delete_char(e);
  • editwin.c

    r72ab15f r435d6b2  
    12201220  /* XXX force a redisplay? */
    12211221  if ((j.ch==13 || j.ch==10) && owl_editwin_check_dotsend(e)) {
    1222     owl_command_editmulti_done(e);
     1222    owl_command_edit_done(e);
    12231223    return;
    12241224  }
  • keys.c

    r2fc8397 r435d6b2  
    103103  owl_keymap_set_submap(km_ew_multi, km_editwin);
    104104
    105   BIND_CMD("UP",      "editmulti:move-up-line", "");
    106   BIND_CMD("M-[ A",   "editmulti:move-up-line", "");
    107   BIND_CMD("C-p",     "editmulti:move-up-line", "");
    108   BIND_CMD("DOWN",    "editmulti:move-down-line", "");
    109   BIND_CMD("M-[ B",   "editmulti:move-down-line", "");
    110   BIND_CMD("C-n",     "editmulti:move-down-line", "");
    111 
    112   BIND_CMD("M-}",     "editmulti:forward-paragraph", "");
    113   BIND_CMD("M-{",     "editmulti:backward-paragraph", "");
     105  BIND_CMD("UP",      "edit:move-up-line", "");
     106  BIND_CMD("M-[ A",   "edit:move-up-line", "");
     107  BIND_CMD("C-p",     "edit:move-up-line", "");
     108  BIND_CMD("DOWN",    "edit:move-down-line", "");
     109  BIND_CMD("M-[ B",   "edit:move-down-line", "");
     110  BIND_CMD("C-n",     "edit:move-down-line", "");
     111
     112  BIND_CMD("M-}",     "edit:forward-paragraph", "");
     113  BIND_CMD("M-{",     "edit:backward-paragraph", "");
    114114
    115115  /* This would be nice, but interferes with C-c to cancel */
    116   /*BIND_CMD("C-c C-c", "editmulti:done", "sends the zephyr");*/
     116  /*BIND_CMD("C-c C-c", "edit:done", "sends the zephyr");*/
    117117
    118118  BIND_CMD("M-p",         "edit:history-prev", "");
     
    121121  /* note that changing "disable-ctrl-d" to "on" will change this to
    122122   * edit:delete-next-char */
    123   BIND_CMD("C-d",     "editmulti:done-or-delete", "sends the zephyr if at the end of the message");
     123  BIND_CMD("C-d",     "edit:done-or-delete", "sends the zephyr if at the end of the message");
    124124
    125125
Note: See TracChangeset for help on using the changeset viewer.