Fix remaining references to old commands

Follow-up to #7809, see #7214

8 files changed, 77 insertions, 77 deletions

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 7767f1eea..9bae037f2 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -565,9 +565,9 @@ Default:
 * +pass:[']+: +pass:[mode-enter jump_mark]+
 * +pass:[+]+: +pass:[zoom-in]+
 * +pass:[-]+: +pass:[zoom-out]+
-* +pass:[.]+: +pass:[repeat-command]+
-* +pass:[/]+: +pass:[set-cmd-text /]+
-* +pass:[:]+: +pass:[set-cmd-text :]+
+* +pass:[.]+: +pass:[cmd-repeat-last]+
+* +pass:[/]+: +pass:[cmd-set-text /]+
+* +pass:[:]+: +pass:[cmd-set-text :]+
 * +pass:[;I]+: +pass:[hint images tab]+
 * +pass:[;O]+: +pass:[hint links fill :open -t -r {hint-url}]+
 * +pass:[;R]+: +pass:[hint --rapid links window]+
@@ -623,9 +623,9 @@ Default:
 * +pass:[<back>]+: +pass:[back]+
 * +pass:[<forward>]+: +pass:[forward]+
 * +pass:[=]+: +pass:[zoom]+
-* +pass:[?]+: +pass:[set-cmd-text ?]+
+* +pass:[?]+: +pass:[cmd-set-text ?]+
 * +pass:[@]+: +pass:[macro-run]+
-* +pass:[B]+: +pass:[set-cmd-text -s :quickmark-load -t]+
+* +pass:[B]+: +pass:[cmd-set-text -s :quickmark-load -t]+
 * +pass:[D]+: +pass:[tab-close -o]+
 * +pass:[F]+: +pass:[hint all tab]+
 * +pass:[G]+: +pass:[scroll-to-perc]+
@@ -635,7 +635,7 @@ Default:
 * +pass:[L]+: +pass:[forward]+
 * +pass:[M]+: +pass:[bookmark-add]+
 * +pass:[N]+: +pass:[search-prev]+
-* +pass:[O]+: +pass:[set-cmd-text -s :open -t]+
+* +pass:[O]+: +pass:[cmd-set-text -s :open -t]+
 * +pass:[PP]+: +pass:[open -t -- {primary}]+
 * +pass:[Pp]+: +pass:[open -t -- {clipboard}]+
 * +pass:[R]+: +pass:[reload -f]+
@@ -643,7 +643,7 @@ Default:
 * +pass:[Sh]+: +pass:[history]+
 * +pass:[Sq]+: +pass:[bookmark-list]+
 * +pass:[Ss]+: +pass:[set]+
-* +pass:[T]+: +pass:[set-cmd-text -sr :tab-focus]+
+* +pass:[T]+: +pass:[cmd-set-text -sr :tab-focus]+
 * +pass:[U]+: +pass:[undo -w]+
 * +pass:[V]+: +pass:[mode-enter caret ;; selection-toggle --line]+
 * +pass:[ZQ]+: +pass:[quit]+
@@ -652,30 +652,30 @@ Default:
 * +pass:[\]\]]+: +pass:[navigate next]+
 * +pass:[`]+: +pass:[mode-enter set_mark]+
 * +pass:[ad]+: +pass:[download-cancel]+
-* +pass:[b]+: +pass:[set-cmd-text -s :quickmark-load]+
+* +pass:[b]+: +pass:[cmd-set-text -s :quickmark-load]+
 * +pass:[cd]+: +pass:[download-clear]+
 * +pass:[co]+: +pass:[tab-only]+
 * +pass:[d]+: +pass:[tab-close]+
 * +pass:[f]+: +pass:[hint]+
 * +pass:[g$]+: +pass:[tab-focus -1]+
 * +pass:[g0]+: +pass:[tab-focus 1]+
-* +pass:[gB]+: +pass:[set-cmd-text -s :bookmark-load -t]+
+* +pass:[gB]+: +pass:[cmd-set-text -s :bookmark-load -t]+
 * +pass:[gC]+: +pass:[tab-clone]+
 * +pass:[gD]+: +pass:[tab-give]+
 * +pass:[gJ]+: +pass:[tab-move +]+
 * +pass:[gK]+: +pass:[tab-move -]+
-* +pass:[gO]+: +pass:[set-cmd-text :open -t -r {url:pretty}]+
+* +pass:[gO]+: +pass:[cmd-set-text :open -t -r {url:pretty}]+
 * +pass:[gU]+: +pass:[navigate up -t]+
 * +pass:[g^]+: +pass:[tab-focus 1]+
 * +pass:[ga]+: +pass:[open -t]+
-* +pass:[gb]+: +pass:[set-cmd-text -s :bookmark-load]+
+* +pass:[gb]+: +pass:[cmd-set-text -s :bookmark-load]+
 * +pass:[gd]+: +pass:[download]+
 * +pass:[gf]+: +pass:[view-source]+
 * +pass:[gg]+: +pass:[scroll-to-perc 0]+
 * +pass:[gi]+: +pass:[hint inputs --first]+
 * +pass:[gm]+: +pass:[tab-move]+
-* +pass:[go]+: +pass:[set-cmd-text :open {url:pretty}]+
-* +pass:[gt]+: +pass:[set-cmd-text -s :tab-select]+
+* +pass:[go]+: +pass:[cmd-set-text :open {url:pretty}]+
+* +pass:[gt]+: +pass:[cmd-set-text -s :tab-select]+
 * +pass:[gu]+: +pass:[navigate up]+
 * +pass:[h]+: +pass:[scroll left]+
 * +pass:[i]+: +pass:[mode-enter insert]+
@@ -684,15 +684,15 @@ Default:
 * +pass:[l]+: +pass:[scroll right]+
 * +pass:[m]+: +pass:[quickmark-save]+
 * +pass:[n]+: +pass:[search-next]+
-* +pass:[o]+: +pass:[set-cmd-text -s :open]+
+* +pass:[o]+: +pass:[cmd-set-text -s :open]+
 * +pass:[pP]+: +pass:[open -- {primary}]+
 * +pass:[pp]+: +pass:[open -- {clipboard}]+
 * +pass:[q]+: +pass:[macro-record]+
 * +pass:[r]+: +pass:[reload]+
 * +pass:[sf]+: +pass:[save]+
-* +pass:[sk]+: +pass:[set-cmd-text -s :bind]+
-* +pass:[sl]+: +pass:[set-cmd-text -s :set -t]+
-* +pass:[ss]+: +pass:[set-cmd-text -s :set]+
+* +pass:[sk]+: +pass:[cmd-set-text -s :bind]+
+* +pass:[sl]+: +pass:[cmd-set-text -s :set -t]+
+* +pass:[ss]+: +pass:[cmd-set-text -s :set]+
 * +pass:[tCH]+: +pass:[config-cycle -p -u *://*.{url:host}/* content.cookies.accept all no-3rdparty never ;; reload]+
 * +pass:[tCh]+: +pass:[config-cycle -p -u *://{url:host}/* content.cookies.accept all no-3rdparty never ;; reload]+
 * +pass:[tCu]+: +pass:[config-cycle -p -u {url} content.cookies.accept all no-3rdparty never ;; reload]+
@@ -721,24 +721,24 @@ Default:
 * +pass:[tsu]+: +pass:[config-cycle -p -t -u {url} content.javascript.enabled ;; reload]+
 * +pass:[u]+: +pass:[undo]+
 * +pass:[v]+: +pass:[mode-enter caret]+
-* +pass:[wB]+: +pass:[set-cmd-text -s :bookmark-load -w]+
+* +pass:[wB]+: +pass:[cmd-set-text -s :bookmark-load -w]+
 * +pass:[wIf]+: +pass:[devtools-focus]+
 * +pass:[wIh]+: +pass:[devtools left]+
 * +pass:[wIj]+: +pass:[devtools bottom]+
 * +pass:[wIk]+: +pass:[devtools top]+
 * +pass:[wIl]+: +pass:[devtools right]+
 * +pass:[wIw]+: +pass:[devtools window]+
-* +pass:[wO]+: +pass:[set-cmd-text :open -w {url:pretty}]+
+* +pass:[wO]+: +pass:[cmd-set-text :open -w {url:pretty}]+
 * +pass:[wP]+: +pass:[open -w -- {primary}]+
-* +pass:[wb]+: +pass:[set-cmd-text -s :quickmark-load -w]+
+* +pass:[wb]+: +pass:[cmd-set-text -s :quickmark-load -w]+
 * +pass:[wf]+: +pass:[hint all window]+
 * +pass:[wh]+: +pass:[back -w]+
 * +pass:[wi]+: +pass:[devtools]+
 * +pass:[wl]+: +pass:[forward -w]+
-* +pass:[wo]+: +pass:[set-cmd-text -s :open -w]+
+* +pass:[wo]+: +pass:[cmd-set-text -s :open -w]+
 * +pass:[wp]+: +pass:[open -w -- {clipboard}]+
-* +pass:[xO]+: +pass:[set-cmd-text :open -b -r {url:pretty}]+
-* +pass:[xo]+: +pass:[set-cmd-text -s :open -b]+
+* +pass:[xO]+: +pass:[cmd-set-text :open -b -r {url:pretty}]+
+* +pass:[xo]+: +pass:[cmd-set-text -s :open -b]+
 * +pass:[yD]+: +pass:[yank domain -s]+
 * +pass:[yM]+: +pass:[yank inline [{title}\]({url}) -s]+
 * +pass:[yP]+: +pass:[yank pretty-url -s]+
diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 329305622..445d308d5 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -234,10 +234,10 @@ def run(args):
         # into insert-mode, so the form can be directly submitted by hitting
         # enter afterwards. It doesn't matter when we go into insert mode, but
         # the other commands need to be be executed sequentially, so we add
-        # delays with later.
+        # delays with cmd-later.
         qute_command('insert-text {} ;;'
-                     'later {} fake-key <Tab> ;;'
-                     'later {} insert-text {}{}'
+                     'cmd-later {} fake-key <Tab> ;;'
+                     'cmd-later {} insert-text {}{}'
                      .format(username, CMD_DELAY,
                              CMD_DELAY * 2, password, insert_mode))
 
diff --git a/misc/userscripts/taskadd b/misc/userscripts/taskadd
index 3f5368b92..222592f79 100755
--- a/misc/userscripts/taskadd
+++ b/misc/userscripts/taskadd
@@ -11,7 +11,7 @@
 #       :spawn --userscript taskadd due:eod pri:H
 #
 #   To enable passing along extra args, I suggest using a mapping like:
-#       :bind <somekey> set-cmd-text -s :spawn --userscript taskadd
+#       :bind <somekey> cmd-set-text -s :spawn --userscript taskadd
 #
 #   If run from hint mode, it uses the selected hint text as the description
 #   and the selected hint url as the annotation.
diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py
index 107bf9156..1ad563c5d 100644
--- a/qutebrowser/commands/runners.py
+++ b/qutebrowser/commands/runners.py
@@ -172,10 +172,10 @@ class CommandRunner(AbstractCommandRunner):
 
                 result.cmd.run(self._win_id, args, count=count)
 
-            if result.cmdline[0] == 'repeat-command':
+            if result.cmdline[0] in ['repeat-command', 'cmd-repeat-last']:
                 record_last_command = False
 
-            if result.cmdline[0] in ['macro-record', 'macro-run', 'set-cmd-text']:
+            if result.cmdline[0] in ['macro-record', 'macro-run', 'set-cmd-text', 'cmd-set-text']:
                 record_macro = False
 
         if record_last_command:
diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py
index 59a26ef97..573f25fa1 100644
--- a/qutebrowser/config/config.py
+++ b/qutebrowser/config/config.py
@@ -154,14 +154,14 @@ class KeyConfig:
         return bindings
 
     def _implied_cmd(self, cmdline: str) -> Optional[str]:
-        """Return cmdline, or the implied cmd if cmdline is a set-cmd-text."""
+        """Return cmdline, or the implied cmd if cmdline is a cmd-set-text."""
         try:
             results = parser.CommandParser().parse_all(cmdline)
         except cmdexc.NoSuchCommandError:
             return None
 
         result = results[0]
-        if result.cmd.name != "set-cmd-text":
+        if result.cmd.name not in ["set-cmd-text", "cmd-set-text"]:
             return cmdline
         if not result.args:
             return None  # doesn't look like this sets a command
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 0b9d669dc..27748cdec 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -3633,17 +3633,17 @@ bindings.default:
   default:
     normal:
       <Escape>: clear-keychain ;; search ;; fullscreen --leave
-      o: set-cmd-text -s :open
-      go: set-cmd-text :open {url:pretty}
-      O: set-cmd-text -s :open -t
-      gO: set-cmd-text :open -t -r {url:pretty}
-      xo: set-cmd-text -s :open -b
-      xO: set-cmd-text :open -b -r {url:pretty}
-      wo: set-cmd-text -s :open -w
-      wO: set-cmd-text :open -w {url:pretty}
-      /: set-cmd-text /
-      ?: set-cmd-text ?
-      ":": "set-cmd-text :"
+      o: cmd-set-text -s :open
+      go: cmd-set-text :open {url:pretty}
+      O: cmd-set-text -s :open -t
+      gO: cmd-set-text :open -t -r {url:pretty}
+      xo: cmd-set-text -s :open -b
+      xO: cmd-set-text :open -b -r {url:pretty}
+      wo: cmd-set-text -s :open -w
+      wO: cmd-set-text :open -w {url:pretty}
+      /: cmd-set-text /
+      ?: cmd-set-text ?
+      ":": "cmd-set-text :"
       ga: open -t
       <Ctrl-T>: open -t
       <Ctrl-N>: open -w
@@ -3653,7 +3653,7 @@ bindings.default:
       <Ctrl-Shift-W>: close
       D: tab-close -o
       co: tab-only
-      T: set-cmd-text -sr :tab-focus
+      T: cmd-set-text -sr :tab-focus
       gm: tab-move
       gK: tab-move -
       gJ: tab-move +
@@ -3725,17 +3725,17 @@ bindings.default:
       wp: open -w -- {clipboard}
       wP: open -w -- {primary}
       m: quickmark-save
-      b: set-cmd-text -s :quickmark-load
-      B: set-cmd-text -s :quickmark-load -t
-      wb: set-cmd-text -s :quickmark-load -w
+      b: cmd-set-text -s :quickmark-load
+      B: cmd-set-text -s :quickmark-load -t
+      wb: cmd-set-text -s :quickmark-load -w
       M: bookmark-add
-      gb: set-cmd-text -s :bookmark-load
-      gB: set-cmd-text -s :bookmark-load -t
-      wB: set-cmd-text -s :bookmark-load -w
+      gb: cmd-set-text -s :bookmark-load
+      gB: cmd-set-text -s :bookmark-load -t
+      wB: cmd-set-text -s :bookmark-load -w
       sf: save
-      ss: set-cmd-text -s :set
-      sl: set-cmd-text -s :set -t
-      sk: set-cmd-text -s :bind
+      ss: cmd-set-text -s :set
+      sl: cmd-set-text -s :set -t
+      sk: cmd-set-text -s :bind
       -: zoom-out
       +: zoom-in
       =: zoom
@@ -3758,7 +3758,7 @@ bindings.default:
       ad: download-cancel
       cd: download-clear
       gf: view-source
-      gt: set-cmd-text -s :tab-select
+      gt: cmd-set-text -s :tab-select
       <Ctrl-Tab>: tab-focus last
       <Ctrl-Shift-Tab>: nop
       <Ctrl-^>: tab-focus last
@@ -3791,7 +3791,7 @@ bindings.default:
       Sh: history
       <Return>: selection-follow
       <Ctrl-Return>: selection-follow -t
-      .: repeat-command
+      .: cmd-repeat-last
       <Ctrl-p>: tab-pin
       <Alt-m>: tab-mute
       gD: tab-give
diff --git a/tests/unit/commands/test_parser.py b/tests/unit/commands/test_parser.py
index 46acd7860..ed9be4ba0 100644
--- a/tests/unit/commands/test_parser.py
+++ b/tests/unit/commands/test_parser.py
@@ -55,22 +55,22 @@ class TestCommandParser:
             p.parse_all(command)
 
     @pytest.mark.parametrize('command, name, args', [
-        ("set-cmd-text -s :open", "set-cmd-text", ["-s", ":open"]),
-        ("set-cmd-text :open {url:pretty}", "set-cmd-text",
+        ("cmd-set-text -s :open", "cmd-set-text", ["-s", ":open"]),
+        ("cmd-set-text :open {url:pretty}", "cmd-set-text",
          [":open {url:pretty}"]),
-        ("set-cmd-text -s :open -t", "set-cmd-text", ["-s", ":open -t"]),
-        ("set-cmd-text :open -t -r {url:pretty}", "set-cmd-text",
+        ("cmd-set-text -s :open -t", "cmd-set-text", ["-s", ":open -t"]),
+        ("cmd-set-text :open -t -r {url:pretty}", "cmd-set-text",
          [":open -t -r {url:pretty}"]),
-        ("set-cmd-text -s :open -b", "set-cmd-text", ["-s", ":open -b"]),
-        ("set-cmd-text :open -b -r {url:pretty}", "set-cmd-text",
+        ("cmd-set-text -s :open -b", "cmd-set-text", ["-s", ":open -b"]),
+        ("cmd-set-text :open -b -r {url:pretty}", "cmd-set-text",
          [":open -b -r {url:pretty}"]),
-        ("set-cmd-text -s :open -w", "set-cmd-text",
+        ("cmd-set-text -s :open -w", "cmd-set-text",
          ["-s", ":open -w"]),
-        ("set-cmd-text :open -w {url:pretty}", "set-cmd-text",
+        ("cmd-set-text :open -w {url:pretty}", "cmd-set-text",
          [":open -w {url:pretty}"]),
-        ("set-cmd-text /", "set-cmd-text", ["/"]),
-        ("set-cmd-text ?", "set-cmd-text", ["?"]),
-        ("set-cmd-text :", "set-cmd-text", [":"]),
+        ("cmd-set-text /", "cmd-set-text", ["/"]),
+        ("cmd-set-text ?", "cmd-set-text", ["?"]),
+        ("cmd-set-text :", "cmd-set-text", [":"]),
     ])
     def test_parse_result(self, config_stub, command, name, args):
         p = parser.CommandParser()
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index fdea792e1..61ce3c5d7 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -185,20 +185,20 @@ class TestKeyConfig:
         # Chained command
         ({'a': 'open foo ;; open bar'},
          {'open foo': ['a'], 'open bar': ['a']}),
-        # Command using set-cmd-text (#5942)
+        # Command using cmd-set-text (#5942)
         (
             {
-                "o": "set-cmd-text -s :open",
-                "O": "set-cmd-text -s :open -t",
-                "go": "set-cmd-text :open {url:pretty}",
+                "o": "cmd-set-text -s :open",
+                "O": "cmd-set-text -s :open -t",
+                "go": "cmd-set-text :open {url:pretty}",
                 # all of these should be ignored
-                "/": "set-cmd-text /",
-                "?": "set-cmd-text ?",
-                ":": "set-cmd-text :",
-                "a": "set-cmd-text no_leading_colon",
-                "b": "set-cmd-text -s -a :skip_cuz_append",
-                "c": "set-cmd-text --append :skip_cuz_append",
-                "x": "set-cmd-text",
+                "/": "cmd-set-text /",
+                "?": "cmd-set-text ?",
+                ":": "cmd-set-text :",
+                "a": "cmd-set-text no_leading_colon",
+                "b": "cmd-set-text -s -a :skip_cuz_append",
+                "c": "cmd-set-text --append :skip_cuz_append",
+                "x": "cmd-set-text",
             },
             {
                 "open": ["o"],
@@ -253,7 +253,7 @@ class TestKeyConfig:
         config_stub.val.bindings.default = no_bindings
         config_stub.val.bindings.commands = no_bindings
         key_config_stub.bind(keyseq('a'),
-                             'set-cmd-text :nop ;; rl-beginning-of-line',
+                             'cmd-set-text :nop ;; rl-beginning-of-line',
                              mode='normal')
 
     def test_bind_default(self, key_config_stub, config_stub):