diff options
Diffstat (limited to 'qutebrowser/keyinput/modeman.py')
-rw-r--r-- | qutebrowser/keyinput/modeman.py | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index 08c5a151b..3c47fafe3 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -86,9 +86,10 @@ def init(win_id: int, parent: QObject) -> 'ModeManager': hintmanager = hints.HintManager(win_id, parent=parent) objreg.register('hintmanager', hintmanager, scope='window', window=win_id, command_only=True) - modeman.hintmanager = hintmanager + log_sensitive_keys = 'log-sensitive-keys' in objects.debug_flags + keyparsers: ParserDictType = { usertypes.KeyMode.normal: modeparsers.NormalKeyParser( @@ -110,7 +111,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager': commandrunner=commandrunner, parent=modeman, passthrough=True, - do_log=False, + do_log=log_sensitive_keys, supports_count=False), usertypes.KeyMode.passthrough: @@ -120,7 +121,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager': commandrunner=commandrunner, parent=modeman, passthrough=True, - do_log=False, + do_log=log_sensitive_keys, supports_count=False), usertypes.KeyMode.command: @@ -130,7 +131,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager': commandrunner=commandrunner, parent=modeman, passthrough=True, - do_log=False, + do_log=log_sensitive_keys, supports_count=False), usertypes.KeyMode.prompt: @@ -140,7 +141,7 @@ def init(win_id: int, parent: QObject) -> 'ModeManager': commandrunner=commandrunner, parent=modeman, passthrough=True, - do_log=False, + do_log=log_sensitive_keys, supports_count=False), usertypes.KeyMode.yesno: @@ -385,11 +386,7 @@ class ModeManager(QObject): self.mode = mode self.entered.emit(mode, self._win_id) - @cmdutils.register( - instance='mode-manager', - scope='window', - deprecated_name='enter-mode', - ) + @cmdutils.register(instance='mode-manager', scope='window') def mode_enter(self, mode: str) -> None: """Enter a key mode. @@ -442,12 +439,8 @@ class ModeManager(QObject): self.enter(self._prev_mode, reason='restore mode before {}'.format(mode.name)) - @cmdutils.register( - instance='mode-manager', - not_modes=[usertypes.KeyMode.normal], - scope='window', - deprecated_name='leave-mode', - ) + @cmdutils.register(instance='mode-manager', + not_modes=[usertypes.KeyMode.normal], scope='window') def mode_leave(self) -> None: """Leave the mode we're currently in.""" if self.mode == usertypes.KeyMode.normal: |