Revert "Add deprecated aliases for renamed commands"

This reverts commit 8976e6850317881ed1aebed55a273e73c17a50bd.

5 files changed, 12 insertions, 21 deletions

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index f2dd282df..f1710adb9 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -917,7 +917,7 @@ class CommandDispatcher:
         return (tabbed_browser, tabbed_browser.widget.widget(idx-1))
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
-                       maxsplit=0, deprecated_name='buffer')
+                       maxsplit=0)
     @cmdutils.argument('index', completion=miscmodels.tabs)
     @cmdutils.argument('count', value=cmdutils.Value.count)
     def tab_select(self, index=None, count=None):
@@ -1488,8 +1488,7 @@ class CommandDispatcher:
             objreg.last_focused_window(), alert=False))
         ed.edit(text, caret_position)
 
-    @cmdutils.register(instance='command-dispatcher', scope='window',
-                       deprecated_name='open-editor')
+    @cmdutils.register(instance='command-dispatcher', scope='window')
     def edit_text(self):
         """Open an external editor with the currently selected form field.
 
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 0e71f2373..dd008d9c5 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -1000,7 +1000,7 @@ class HintManager(QObject):
             self._context.first_run = False
 
     @cmdutils.register(instance='hintmanager', scope='window',
-                       modes=[usertypes.KeyMode.hint], deprecated_name='follow-hint')
+                       modes=[usertypes.KeyMode.hint])
     def hint_follow(self, select: bool = False, keystring: str = None) -> None:
         """Follow a hint.
 
diff --git a/qutebrowser/components/caretcommands.py b/qutebrowser/components/caretcommands.py
index 7b1eb47ea..8ab175012 100644
--- a/qutebrowser/components/caretcommands.py
+++ b/qutebrowser/components/caretcommands.py
@@ -183,7 +183,7 @@ def move_to_end_of_document(tab: apitypes.Tab) -> None:
     tab.caret.move_to_end_of_document()
 
 
-@cmdutils.register(modes=[cmdutils.KeyMode.caret], deprecated_name='toggle-selection')
+@cmdutils.register(modes=[cmdutils.KeyMode.caret])
 @cmdutils.argument('tab', value=cmdutils.Value.cur_tab)
 def selection_toggle(tab: apitypes.Tab, line: bool = False) -> None:
     """Toggle caret selection mode.
@@ -194,14 +194,14 @@ def selection_toggle(tab: apitypes.Tab, line: bool = False) -> None:
     tab.caret.toggle_selection(line)
 
 
-@cmdutils.register(modes=[cmdutils.KeyMode.caret], deprecated_name='drop-selection')
+@cmdutils.register(modes=[cmdutils.KeyMode.caret])
 @cmdutils.argument('tab', value=cmdutils.Value.cur_tab)
 def selection_drop(tab: apitypes.Tab) -> None:
     """Drop selection and keep selection mode enabled."""
     tab.caret.drop_selection()
 
 
-@cmdutils.register(deprecated_name='follow-selected')
+@cmdutils.register()
 @cmdutils.argument('tab_obj', value=cmdutils.Value.cur_tab)
 def selection_follow(tab_obj: apitypes.Tab, *, tab: bool = False) -> None:
     """Follow the selected text.
@@ -215,7 +215,7 @@ def selection_follow(tab_obj: apitypes.Tab, *, tab: bool = False) -> None:
         raise cmdutils.CommandError(str(e))
 
 
-@cmdutils.register(modes=[cmdutils.KeyMode.caret], deprecated_name='reverse-selection')
+@cmdutils.register(modes=[cmdutils.KeyMode.caret])
 @cmdutils.argument('tab', value=cmdutils.Value.cur_tab)
 def selection_reverse(tab: apitypes.Tab) -> None:
     """Swap the stationary and moving end of the current selection."""
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 c00120596..3c47fafe3 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -386,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.
 
@@ -443,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: