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

Merge branch 'nanjekyejoannah-issue#672'

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-19 13:41:33 +02:00
commit b6f35a52cd
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.asciidoc
View File

@ -97,6 +97,8 @@ Changed
- Sending a command to an existing instance (via "qutebrowser :reload") now - Sending a command to an existing instance (via "qutebrowser :reload") now
doesn't mark it as urgent anymore. doesn't mark it as urgent anymore.
- `tabs -> title-format` now treats an empty string as valid. - `tabs -> title-format` now treats an empty string as valid.
- Bindings for `:`, `/` and `?` are now configured explicitly and not hardcoded
anymore.
Deprecated Deprecated
~~~~~~~~~~ ~~~~~~~~~~

2
README.asciidoc
View File

@ -172,9 +172,9 @@ Contributors, sorted by the number of commits in descending order:
* ZDarian * ZDarian
* Milan Svoboda * Milan Svoboda
* John ShaggyTwoDope Jenkins * John ShaggyTwoDope Jenkins
* nanjekyejoannah
* Peter Vilim * Peter Vilim
* Clayton Craft * Clayton Craft
* nanjekyejoannah
* Oliver Caldwell * Oliver Caldwell
* Jonas Schürmann * Jonas Schürmann
* error800 * error800

3
qutebrowser/config/configdata.py
View File

@ -1477,6 +1477,9 @@ KEY_DATA = collections.OrderedDict([
('set-cmd-text :open -b -i {url:pretty}', ['xO']), ('set-cmd-text :open -b -i {url:pretty}', ['xO']),
('set-cmd-text -s :open -w', ['wo']), ('set-cmd-text -s :open -w', ['wo']),
('set-cmd-text :open -w {url:pretty}', ['wO']), ('set-cmd-text :open -w {url:pretty}', ['wO']),
('set-cmd-text -s :search', ['/']),
('set-cmd-text -s :search -r', ['?']),
('set-cmd-text -s :', [':']),
('open -t', ['ga', '<Ctrl-T>']), ('open -t', ['ga', '<Ctrl-T>']),
('open -w', ['<Ctrl-N>']), ('open -w', ['<Ctrl-N>']),
('tab-close', ['d', '<Ctrl-W>']), ('tab-close', ['d', '<Ctrl-W>']),

6
qutebrowser/keyinput/modeparsers.py
View File

@ -25,7 +25,6 @@ Module attributes:
from PyQt5.QtCore import pyqtSlot, Qt from PyQt5.QtCore import pyqtSlot, Qt
from qutebrowser.utils import message
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.keyinput import keyparser from qutebrowser.keyinput import keyparser
from qutebrowser.utils import usertypes, log, objreg, utils from qutebrowser.utils import usertypes, log, objreg, utils
@ -70,9 +69,6 @@ class NormalKeyParser(keyparser.CommandKeyParser):
self._debug_log("Ignoring key '{}', because the normal mode is " self._debug_log("Ignoring key '{}', because the normal mode is "
"currently inhibited.".format(txt)) "currently inhibited.".format(txt))
return self.Match.none return self.Match.none
if not self._keystring and any(txt == c for c in STARTCHARS):
message.set_cmd_text(self._win_id, txt)
return self.Match.definitive
match = super()._handle_single_key(e) match = super()._handle_single_key(e)
if match == self.Match.partial: if match == self.Match.partial:
timeout = config.get('input', 'partial-timeout') timeout = config.get('input', 'partial-timeout')
@ -231,7 +227,7 @@ class HintKeyParser(keyparser.CommandKeyParser):
if keytype == self.Type.chain: if keytype == self.Type.chain:
hintmanager = objreg.get('hintmanager', scope='tab', hintmanager = objreg.get('hintmanager', scope='tab',
window=self._win_id, tab='current') window=self._win_id, tab='current')
hintmanager.handle_partial_key(cmdstr) hintmanager.fire(cmdstr)
else: else:
# execute as command # execute as command
super().execute(cmdstr, keytype, count) super().execute(cmdstr, keytype, count)