diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index e4a84f6c7..e9e3ba19f 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -867,9 +867,9 @@ Similar to bash, fish has Emacs and Vi editing modes. The default editing mode i - @key{Alt,←,Left} and @key{Alt,→,Right} move the cursor one word left or right, or moves forward/backward in the directory history if the command line is empty. If the cursor is already at the end of the line, and an autosuggestion is available, @key{Alt,→,Right} (or @key{Alt,F}) accepts the first word in the suggestion. -- @cursor_key{↑,Up} and @cursor_key{↓,Down} search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the history section for more information on history searching. +- @cursor_key{↑,Up} and @cursor_key{↓,Down} search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the history section for more information on history searching. -- @key{Alt,↑,Up} and @key{Alt,↓,Down} search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the history section for more information on history searching. +- @key{Alt,↑,Up} and @key{Alt,↓,Down} search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the history section for more information on history searching. - @key{Delete} and @key{Backspace} removes one character forwards or backwards respectively. @@ -904,64 +904,61 @@ You can change these key bindings using the bindinsert mode is active. @key{Escape} enters command mode. The commands available in command, insert and visual mode are described below. -- __Deafult/Command Mode__ +\subsubsection vi-mode-command Command mode - - @key{h} moves cursor left +Command mode is also known as normal mode. - - @key{l} moves cursor right +- @key{h} moves the cursor left. - - @key{i} enter __insert mode__ at current position +- @key{l} moves the cursor right. - - @key{v} enter __visual mode__ at current position +- @key{i} enters insert mode at the current cursor position. - - @key{a} enter __insert mode__ after current position +- @key{v} enters visual mode at the current cursor position. - - @key{Shift,A} moves cursor to end of line and put in __insert mode__ +- @key{a} enters insert mode after the current cursor position. - - @key{0} (zero) Move cursor to beginning of line (doesn't put in __insert mode__) +- @key{Shift,A} enters insert mode at the end of the line. - - @key{d}@key{d} Delete line (saved for pasting) +- @key{0} (zero) moves the cursor to beginning of line (remaining in command mode). - - @key{Shift,D} delete text after current cursor position (saved for pasting) +- @key{d}@key{d} deletes the current line and moves it to the killring. - - @key{p} paste text that was deleted +- @key{Shift,D} deletes text after the current cursor position and moves it to the killring. - - @key{u} undo +- @key{p} pastes text from the killring. - - @key{[} and @key{]} search the command history for the previous/next token +- @key{u} undoes the most recent action. - - @key{Control,C} clear the current command line and start over +- @key{[} and @key{]} search the command history for the previous/next token containing the token under the cursor before the search was started. See the history section for more information on history searching. -- __Insert Mode__ +- @key{Control,C} deletes the entire line. - - @key{Tab} completes the current token. +\subsubsection vi-mode-insert Insert mode - - @key{Escape} or @key{Control,C} exit back to __normal mode__ +- @key{Tab} completes the current token. - - @cursor_key{↑,Up} and @cursor_key{↓,Down} search the command history; see history . +- @key{Escape} or @key{Control,C} enters command mode. - - @key{Control,W} moves the previous word to the killring. +- @cursor_key{↑,Up} and @cursor_key{↓,Down} search the command history. See the history section for more information on history searching. - - @key{Control,U} moves contents from the beginning of line to the cursor to the killring. +- @key{Control,W} moves the previous word to the killring. - - @key{Control,B} and @key{Control,F} move the cursor one word left or right. If the cursor is already at the end of the line, and an autosuggestion is available, @key{Control,F} accepts the first word in the suggestion. +- @key{Control,U} moves contents from the beginning of line to the cursor to the killring. -- __Visual Mode__ +- @key{Control,B} and @key{Control,F} move the cursor one word left or right. If the cursor is already at the end of the line, and an autosuggestion is available, @key{Control,F} accepts the first word in the suggestion. - - @cursor_key{←,Left} and @cursor_key{→,Right} extend bounds of selection by one character left/right +\subsubsection vi-mode-visual Visual mode - - @key{b} and @key{w} extend bounds of selection backward/forward by one word +- @cursor_key{←,Left} and @cursor_key{→,Right} extend the selection backward/forward by one character. - - @key{d} delete the selection, and exit back to __normal mode__ +- @key{b} and @key{w} extend the selection backward/forward by one word. - - @key{x} cut the selection (ie, delete and save for pasting), and exit back to __normal mode__ - - - @key{Escape} or @key{Control,C} exit back to __normal mode__ - -- etc, for many of the other Vi commands. +- @key{d} and @key{x} move the selection to the killring and enter command mode. +- @key{Escape} and @key{Control,C} enter command mode. \subsection killring Copy and paste (Kill Ring)