Merge branch 'timeout_docs' of https://github.com/rcorre/qutebrowser into rcorre-timeout_docs

This commit is contained in:
Florian Bruhin 2016-05-18 07:26:12 +02:00
commit 43518a4624
2 changed files with 10 additions and 2 deletions

View File

@ -863,12 +863,16 @@ Options related to input modes.
=== timeout === timeout
Timeout for ambiguous key bindings. Timeout for ambiguous key bindings.
If the current input forms both a complete match and a partial match, the complete match will be executed after this time.
Default: +pass:[500]+ Default: +pass:[500]+
[[input-partial-timeout]] [[input-partial-timeout]]
=== partial-timeout === partial-timeout
Timeout for partially typed key bindings. Timeout for partially typed key bindings.
If the current input forms only partial matches, the keystring will be cleared after this time.
Default: +pass:[1000]+ Default: +pass:[1000]+
[[input-insert-mode-on-plugins]] [[input-insert-mode-on-plugins]]

View File

@ -470,11 +470,15 @@ def data(readonly=False):
('input', sect.KeyValue( ('input', sect.KeyValue(
('timeout', ('timeout',
SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'), SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'),
"Timeout for ambiguous key bindings."), "Timeout for ambiguous key bindings.\n\n"
"If the current input forms both a complete match and a partial "
"match, the complete match will be executed after this time."),
('partial-timeout', ('partial-timeout',
SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '1000'), SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '1000'),
"Timeout for partially typed key bindings."), "Timeout for partially typed key bindings.\n\n"
"If the current input forms only partial matches, the keystring "
"will be cleared after this time."),
('insert-mode-on-plugins', ('insert-mode-on-plugins',
SettingValue(typ.Bool(), 'false'), SettingValue(typ.Bool(), 'false'),