diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-08-31 09:24:51 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-08-31 09:24:51 +0000 |
| commit | 554f19eb05104bddf84816b732d6e7a837164310 (patch) | |
| tree | b862ef7e852dd68598920d159f49cc065d71bd93 /mode-key.c | |
| parent | fc8d3f7a5645ec1d55d361911443fad1867fe8cb (diff) | |
Sync OpenBSD patchset 1167:
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 }, |