diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2012-08-27 21:29:23 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2012-08-27 21:29:23 +0000 |
| commit | 753775033a9e2ff754a3cfb6017e4815669b356b (patch) | |
| tree | 2c01f427a3b25e3d08d1bc0e41aef1463dd63bd7 /mode-key.c | |
| parent | d39c58c01c7d8fce29ee00632bf12a6b47ce942a (diff) | |
Instead of requiring a prompt to enter all numbers >10, go back to
0-9a-z and add A-Z and enter the prompt when M-0 to M-9 are pressed
(like in copy mode). Prompted by request from mcbride@, help from Thomas
Adam.
Diffstat (limited to 'mode-key.c')
| -rw-r--r-- | mode-key.c | 40 |
1 files changed, 20 insertions, 20 deletions
@@ -192,16 +192,16 @@ struct mode_key_tree mode_key_tree_vi_edit; /* vi choice selection keys. */ const struct mode_key_entry mode_key_vi_choice[] = { - { '0', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '1', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '2', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '3', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '4', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '5', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '6', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '7', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '8', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '9', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '0' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '1' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '2' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '3' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '4' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '5' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '6' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '7' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '8' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '9' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, { '\002' /* C-b */, 0, MODEKEYCHOICE_PAGEUP }, { '\003' /* C-c */, 0, MODEKEYCHOICE_CANCEL }, { '\005' /* C-e */, 0, MODEKEYCHOICE_SCROLLDOWN }, @@ -330,16 +330,16 @@ struct mode_key_tree mode_key_tree_emacs_edit; /* emacs choice selection keys. */ const struct mode_key_entry mode_key_emacs_choice[] = { - { '0', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '1', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '2', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '3', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '4', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '5', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '6', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '7', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '8', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, - { '9', 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '0' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '1' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '2' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '3' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '4' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '5' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '6' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '7' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '8' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, + { '9' | KEYC_ESCAPE, 0, MODEKEYCHOICE_STARTNUMBERPREFIX }, { '\003' /* C-c */, 0, MODEKEYCHOICE_CANCEL }, { '\016' /* C-n */, 0, MODEKEYCHOICE_DOWN }, { '\020' /* C-p */, 0, MODEKEYCHOICE_UP }, |