Merge branch 'V155-master'

This commit is contained in:
Florian Bruhin 2015-05-06 16:38:27 +02:00
commit 4fb026708b
2 changed files with 4 additions and 3 deletions

View File

@ -153,6 +153,7 @@ Contributors, sorted by the number of commits in descending order:
* Regina Hug
* Mathias Fussenegger
* Larry Hynes
* Fritz V155 Reichwald
* error800
* Thorsten Wißmann
* Thiago Barroso Perrotta

View File

@ -1213,7 +1213,7 @@ KEY_DATA = collections.OrderedDict([
])),
('hint', collections.OrderedDict([
('follow-hint', ['<Return>']),
('follow-hint', ['<Return>', '<Ctrl-M>', '<Ctrl-J>']),
])),
('passthrough', {}),
@ -1223,11 +1223,11 @@ KEY_DATA = collections.OrderedDict([
('command-history-next', ['<Ctrl-N>']),
('completion-item-prev', ['<Shift-Tab>', '<Up>']),
('completion-item-next', ['<Tab>', '<Down>']),
('command-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>']),
('command-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>', '<Ctrl-M>']),
])),
('prompt', collections.OrderedDict([
('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>']),
('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>', '<Ctrl-M>']),
('prompt-yes', ['y']),
('prompt-no', ['n']),
])),