Rename selection commands

See #6022

3 files changed, 36 insertions, 32 deletions

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 46f76c83b..d6c397e85 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -179,6 +179,10 @@ Changed
   * `record-macro` -> `macro-record`
   * `buffer` -> `tab-select`
   * `open-editor` -> `edit-text`
+  * `toggle-selection` -> `selection-toggle`
+  * `drop-selection` -> `selection-drop`
+  * `reverse-selection` -> `selection-reverse`
+  * `follow-selected` -> `selection-follow`
 - Various performance improvements, including for the startup time.
 
 Fixed
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index d6bf5d357..b2e284b68 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -64,7 +64,6 @@ possible to run or bind multiple commands by separating them with `;;`.
 |<<edit-url,edit-url>>|Navigate to a url formed in an external editor.
 |<<enter-mode,enter-mode>>|Enter a key mode.
 |<<fake-key,fake-key>>|Send a fake keypress or key string to the website or qutebrowser.
-|<<follow-selected,follow-selected>>|Follow the selected text.
 |<<forward,forward>>|Go forward in the history of the current tab.
 |<<fullscreen,fullscreen>>|Toggle fullscreen mode.
 |<<greasemonkey-reload,greasemonkey-reload>>|Re-read Greasemonkey scripts from disk.
@@ -107,6 +106,7 @@ possible to run or bind multiple commands by separating them with `;;`.
 |<<search,search>>|Search for a text on the current page. With no text, clear results.
 |<<search-next,search-next>>|Continue the search to the ([count]th) next term.
 |<<search-prev,search-prev>>|Continue the search to the ([count]th) previous term.
+|<<selection-follow,selection-follow>>|Follow the selected text.
 |<<session-delete,session-delete>>|Delete a session.
 |<<session-load,session-load>>|Load a session.
 |<<session-save,session-save>>|Save a session.
@@ -542,15 +542,6 @@ Send a fake keypress or key string to the website or qutebrowser.
 ==== optional arguments
 * +*-g*+, +*--global*+: If given, the keys are sent to the qutebrowser UI.
 
-[[follow-selected]]
-=== follow-selected
-Syntax: +:follow-selected [*--tab*]+
-
-Follow the selected text.
-
-==== optional arguments
-* +*-t*+, +*--tab*+: Load the selected link in a new tab.
-
 [[forward]]
 === forward
 Syntax: +:forward [*--tab*] [*--bg*] [*--window*] ['index']+
@@ -1178,6 +1169,15 @@ Continue the search to the ([count]th) previous term.
 ==== count
 How many elements to ignore.
 
+[[selection-follow]]
+=== selection-follow
+Syntax: +:selection-follow [*--tab*]+
+
+Follow the selected text.
+
+==== optional arguments
+* +*-t*+, +*--tab*+: Load the selected link in a new tab.
+
 [[session-delete]]
 === session-delete
 Syntax: +:session-delete [*--force*] 'name'+
@@ -1601,7 +1601,6 @@ How many steps to zoom out.
 |<<completion-item-del,completion-item-del>>|Delete the current completion item.
 |<<completion-item-focus,completion-item-focus>>|Shift the focus of the completion menu to another item.
 |<<completion-item-yank,completion-item-yank>>|Yank the current completion item into the clipboard.
-|<<drop-selection,drop-selection>>|Drop selection and keep selection mode enabled.
 |<<follow-hint,follow-hint>>|Follow a hint.
 |<<leave-mode,leave-mode>>|Leave the mode we're currently in.
 |<<move-to-end-of-document,move-to-end-of-document>>|Move the cursor or selection to the end of the document.
@@ -1623,7 +1622,6 @@ How many steps to zoom out.
 |<<prompt-item-focus,prompt-item-focus>>|Shift the focus of the prompt file completion menu to another item.
 |<<prompt-open-download,prompt-open-download>>|Immediately open a download.
 |<<prompt-yank,prompt-yank>>|Yank URL to clipboard or primary selection.
-|<<reverse-selection,reverse-selection>>|Swap the stationary and moving end of the current selection.
 |<<rl-backward-char,rl-backward-char>>|Move back a character.
 |<<rl-backward-delete-char,rl-backward-delete-char>>|Delete the character before the cursor.
 |<<rl-backward-kill-word,rl-backward-kill-word>>|Remove chars from the cursor to the beginning of the word.
@@ -1639,7 +1637,9 @@ How many steps to zoom out.
 |<<rl-unix-line-discard,rl-unix-line-discard>>|Remove chars backward from the cursor to the beginning of the line.
 |<<rl-unix-word-rubout,rl-unix-word-rubout>>|Remove chars from the cursor to the beginning of the word.
 |<<rl-yank,rl-yank>>|Paste the most recently deleted text.
-|<<toggle-selection,toggle-selection>>|Toggle caret selection mode.
+|<<selection-drop,selection-drop>>|Drop selection and keep selection mode enabled.
+|<<selection-reverse,selection-reverse>>|Swap the stationary and moving end of the current selection.
+|<<selection-toggle,selection-toggle>>|Toggle caret selection mode.
 |==============
 [[command-accept]]
 === command-accept
@@ -1685,10 +1685,6 @@ Yank the current completion item into the clipboard.
 ==== optional arguments
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
 
-[[drop-selection]]
-=== drop-selection
-Drop selection and keep selection mode enabled.
-
 [[follow-hint]]
 === follow-hint
 Syntax: +:follow-hint [*--select*] ['keystring']+
@@ -1849,10 +1845,6 @@ Yank URL to clipboard or primary selection.
 ==== optional arguments
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
 
-[[reverse-selection]]
-=== reverse-selection
-Swap the stationary and moving end of the current selection.
-
 [[rl-backward-char]]
 === rl-backward-char
 Move back a character.
@@ -1943,9 +1935,17 @@ Paste the most recently deleted text.
 
 This acts like readline's yank.
 
-[[toggle-selection]]
-=== toggle-selection
-Syntax: +:toggle-selection [*--line*]+
+[[selection-drop]]
+=== selection-drop
+Drop selection and keep selection mode enabled.
+
+[[selection-reverse]]
+=== selection-reverse
+Swap the stationary and moving end of the current selection.
+
+[[selection-toggle]]
+=== selection-toggle
+Syntax: +:selection-toggle [*--line*]+
 
 Toggle caret selection mode.
 
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index e1a241658..085dc3637 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -463,16 +463,16 @@ Default:
 
 * +pass:[$]+: +pass:[move-to-end-of-line]+
 * +pass:[0]+: +pass:[move-to-start-of-line]+
-* +pass:[&lt;Ctrl-Space&gt;]+: +pass:[drop-selection]+
+* +pass:[&lt;Ctrl-Space&gt;]+: +pass:[selection-drop]+
 * +pass:[&lt;Escape&gt;]+: +pass:[leave-mode]+
 * +pass:[&lt;Return&gt;]+: +pass:[yank selection]+
-* +pass:[&lt;Space&gt;]+: +pass:[toggle-selection]+
+* +pass:[&lt;Space&gt;]+: +pass:[selection-toggle]+
 * +pass:[G]+: +pass:[move-to-end-of-document]+
 * +pass:[H]+: +pass:[scroll left]+
 * +pass:[J]+: +pass:[scroll down]+
 * +pass:[K]+: +pass:[scroll up]+
 * +pass:[L]+: +pass:[scroll right]+
-* +pass:[V]+: +pass:[toggle-selection --line]+
+* +pass:[V]+: +pass:[selection-toggle --line]+
 * +pass:[Y]+: +pass:[yank selection -s]+
 * +pass:[[]+: +pass:[move-to-start-of-prev-block]+
 * +pass:[]]+: +pass:[move-to-start-of-next-block]+
@@ -484,8 +484,8 @@ Default:
 * +pass:[j]+: +pass:[move-to-next-line]+
 * +pass:[k]+: +pass:[move-to-prev-line]+
 * +pass:[l]+: +pass:[move-to-next-char]+
-* +pass:[o]+: +pass:[reverse-selection]+
-* +pass:[v]+: +pass:[toggle-selection]+
+* +pass:[o]+: +pass:[selection-reverse]+
+* +pass:[v]+: +pass:[selection-toggle]+
 * +pass:[w]+: +pass:[move-to-next-word]+
 * +pass:[y]+: +pass:[yank selection]+
 * +pass:[{]+: +pass:[move-to-end-of-prev-block]+
@@ -576,7 +576,7 @@ Default:
 * +pass:[&lt;Ctrl-PgDown&gt;]+: +pass:[tab-next]+
 * +pass:[&lt;Ctrl-PgUp&gt;]+: +pass:[tab-prev]+
 * +pass:[&lt;Ctrl-Q&gt;]+: +pass:[quit]+
-* +pass:[&lt;Ctrl-Return&gt;]+: +pass:[follow-selected -t]+
+* +pass:[&lt;Ctrl-Return&gt;]+: +pass:[selection-follow -t]+
 * +pass:[&lt;Ctrl-Shift-N&gt;]+: +pass:[open -p]+
 * +pass:[&lt;Ctrl-Shift-T&gt;]+: +pass:[undo]+
 * +pass:[&lt;Ctrl-Shift-Tab&gt;]+: +pass:[nop]+
@@ -594,7 +594,7 @@ Default:
 * +pass:[&lt;Escape&gt;]+: +pass:[clear-keychain ;; search ;; fullscreen --leave]+
 * +pass:[&lt;F11&gt;]+: +pass:[fullscreen]+
 * +pass:[&lt;F5&gt;]+: +pass:[reload]+
-* +pass:[&lt;Return&gt;]+: +pass:[follow-selected]+
+* +pass:[&lt;Return&gt;]+: +pass:[selection-follow]+
 * +pass:[&lt;back&gt;]+: +pass:[back]+
 * +pass:[&lt;forward&gt;]+: +pass:[forward]+
 * +pass:[=]+: +pass:[zoom]+
@@ -620,7 +620,7 @@ Default:
 * +pass:[Ss]+: +pass:[open qute://settings]+
 * +pass:[T]+: +pass:[tab-focus]+
 * +pass:[U]+: +pass:[undo -w]+
-* +pass:[V]+: +pass:[enter-mode caret ;; toggle-selection --line]+
+* +pass:[V]+: +pass:[enter-mode caret ;; selection-toggle --line]+
 * +pass:[ZQ]+: +pass:[quit]+
 * +pass:[ZZ]+: +pass:[quit --save]+
 * +pass:[[[]+: +pass:[navigate prev]+