rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'V155-master'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.asciidoc
View File

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

6
qutebrowser/config/configdata.py
View File

@ -1213,7 +1213,7 @@ KEY_DATA = collections.OrderedDict([
])), ])),
('hint', collections.OrderedDict([ ('hint', collections.OrderedDict([
('follow-hint', ['<Return>']), ('follow-hint', ['<Return>', '<Ctrl-M>', '<Ctrl-J>']),
])), ])),
('passthrough', {}), ('passthrough', {}),
@ -1223,11 +1223,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>', '<Ctrl-J>', '<Shift-Return>', '<Ctrl-M>']),
])), ])),
('prompt', collections.OrderedDict([ ('prompt', collections.OrderedDict([
('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>']), ('prompt-accept', ['<Return>', '<Ctrl-J>', '<Shift-Return>', '<Ctrl-M>']),
('prompt-yes', ['y']), ('prompt-yes', ['y']),
('prompt-no', ['n']), ('prompt-no', ['n']),
])), ])),