Merge branch 'master' into dev-split-parser

2 files changed, 11 insertions, 18 deletions

diff --git a/qutebrowser/keyinput/macros.py b/qutebrowser/keyinput/macros.py
index fc67a7387..fdef7c669 100644
--- a/qutebrowser/keyinput/macros.py
+++ b/qutebrowser/keyinput/macros.py
@@ -52,7 +52,7 @@ class MacroRecorder:
         self._macro_count: Dict[int, int] = {}
         self._last_register: Optional[str] = None
 
-    @cmdutils.register(instance='macro-recorder', deprecated_name='record-macro')
+    @cmdutils.register(instance='macro-recorder')
     @cmdutils.argument('win_id', value=cmdutils.Value.win_id)
     def macro_record(self, win_id: int, register: str = None) -> None:
         """Start or stop recording a macro.
@@ -77,7 +77,7 @@ class MacroRecorder:
         self._macros[register] = []
         self._recording_macro = register
 
-    @cmdutils.register(instance='macro-recorder', deprecated_name='run-macro')
+    @cmdutils.register(instance='macro-recorder')
     @cmdutils.argument('win_id', value=cmdutils.Value.win_id)
     @cmdutils.argument('count', value=cmdutils.Value.count)
     def macro_run(self, win_id: int, count: int = 1, register: str = None) -> None:
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: