Accept numpad-enter as return in default bindings.

See https://bbs.archlinux.org/viewtopic.php?pid=1523326#p1523326
This commit is contained in:
Florian Bruhin 2015-06-01 13:38:13 +02:00
parent f1c0781a4c
commit 6c2fe3417e
2 changed files with 13 additions and 9 deletions

View File

@ -45,7 +45,7 @@ Changed
- `:spawn` now shows the command being executed in the statusbar, use `-q`/`--quiet` for the old behavior. - `:spawn` now shows the command being executed in the statusbar, use `-q`/`--quiet` for the old behavior.
- The `content -> geolocation` and `notifications` settings now support a `true` value to always allow those. However, this is *not recommended*. - The `content -> geolocation` and `notifications` settings now support a `true` value to always allow those. However, this is *not recommended*.
- New bindings `<Ctrl-R>` (rapid), `<Ctrl-F>` (foreground) and `<Ctrl-B>` (background) to switch hint modes while hinting. - New bindings `<Ctrl-R>` (rapid), `<Ctrl-F>` (foreground) and `<Ctrl-B>` (background) to switch hint modes while hinting.
- `<Ctrl-M>` is now accepted as an additional alias for `<Return>`/`<Ctrl-J>` - `<Ctrl-M>` and numpad-enter are now bound by default for bindings where `<Return>` was bound.
- `:hint tab` and `F` now respect the `background-tabs` setting. To enforce a foreground tab (what `F` did before), use `:hint tab-fg` or `;f`. - `:hint tab` and `F` now respect the `background-tabs` setting. To enforce a foreground tab (what `F` did before), use `:hint tab-fg` or `;f`.
- `:scroll` now takes a direction argument (`up`/`down`/`left`/`right`/`top`/`bottom`/`page-up`/`page-down`) instead of two pixel arguments (`dx`/`dy`). The old form still works but is deprecated. - `:scroll` now takes a direction argument (`up`/`down`/`left`/`right`/`top`/`bottom`/`page-up`/`page-down`) instead of two pixel arguments (`dx`/`dy`). The old form still works but is deprecated.

View File

@ -1125,6 +1125,12 @@ KEY_SECTION_DESC = {
""), ""),
} }
# Keys which are similiar to Return and should be bound by default where Return
# is bound.
RETURN_KEYS = ['<Return>', '<Ctrl-M>', '<Ctrl-J>', '<Shift-Return>', '<Enter>',
'<Shift-Enter>']
KEY_DATA = collections.OrderedDict([ KEY_DATA = collections.OrderedDict([
('!normal', collections.OrderedDict([ ('!normal', collections.OrderedDict([
@ -1243,8 +1249,8 @@ KEY_DATA = collections.OrderedDict([
('stop', ['<Ctrl-s>']), ('stop', ['<Ctrl-s>']),
('print', ['<Ctrl-Alt-p>']), ('print', ['<Ctrl-Alt-p>']),
('open qute:settings', ['Ss']), ('open qute:settings', ['Ss']),
('follow-selected', ['<Return>']), ('follow-selected', RETURN_KEYS),
('follow-selected -t', ['<Ctrl-Return>']), ('follow-selected -t', ['<Ctrl-Return>', '<Ctrl-Enter>']),
])), ])),
('insert', collections.OrderedDict([ ('insert', collections.OrderedDict([
@ -1252,7 +1258,7 @@ KEY_DATA = collections.OrderedDict([
])), ])),
('hint', collections.OrderedDict([ ('hint', collections.OrderedDict([
('follow-hint', ['<Return>', '<Ctrl-M>', '<Ctrl-J>']), ('follow-hint', RETURN_KEYS),
('hint --rapid links tab-bg', ['<Ctrl-R>']), ('hint --rapid links tab-bg', ['<Ctrl-R>']),
('hint links', ['<Ctrl-F>']), ('hint links', ['<Ctrl-F>']),
('hint all tab-bg', ['<Ctrl-B>']), ('hint all tab-bg', ['<Ctrl-B>']),
@ -1265,13 +1271,11 @@ KEY_DATA = collections.OrderedDict([
('command-history-next', ['<Ctrl-N>']), ('command-history-next', ['<Ctrl-N>']),
('completion-item-prev', ['<Shift-Tab>', '<Up>']), ('completion-item-prev', ['<Shift-Tab>', '<Up>']),
('completion-item-next', ['<Tab>', '<Down>']), ('completion-item-next', ['<Tab>', '<Down>']),
('command-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>', ('command-accept', RETURN_KEYS),
'<Ctrl-M>']),
])), ])),
('prompt', collections.OrderedDict([ ('prompt', collections.OrderedDict([
('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>', ('prompt-accept', RETURN_KEYS),
'<Ctrl-M>']),
('prompt-yes', ['y']), ('prompt-yes', ['y']),
('prompt-no', ['n']), ('prompt-no', ['n']),
])), ])),
@ -1312,7 +1316,7 @@ KEY_DATA = collections.OrderedDict([
('move-to-start-of-document', ['gg']), ('move-to-start-of-document', ['gg']),
('move-to-end-of-document', ['G']), ('move-to-end-of-document', ['G']),
('yank-selected -p', ['Y']), ('yank-selected -p', ['Y']),
('yank-selected', ['y', '<Return>', '<Ctrl-J>']), ('yank-selected', ['y'] + RETURN_KEYS),
('scroll left', ['H']), ('scroll left', ['H']),
('scroll down', ['J']), ('scroll down', ['J']),
('scroll up', ['K']), ('scroll up', ['K']),