From 45f83c70ee030f9f398b3db9c2e1dbaaf2880c72 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 16 Oct 2026 05:49:31 -0400 Subject: docs: cleanup tables, highlights.scm #42381 highlights.scm: `#match` is slow, prefer `#lua-match`. --- runtime/doc/api.txt | 2 +- runtime/doc/change.txt | 66 +++++------ runtime/doc/filetype.txt | 2 +- runtime/doc/gui.txt | 148 +++++++++++------------ runtime/doc/index.txt | 48 ++++---- runtime/doc/insert.txt | 92 +++++++-------- runtime/doc/map.txt | 39 +++--- runtime/doc/mbyte.txt | 57 +++++---- runtime/doc/options.txt | 4 +- runtime/doc/pattern.txt | 8 +- runtime/doc/quickfix.txt | 13 +- runtime/doc/quickref.txt | 2 +- runtime/doc/repeat.txt | 2 +- runtime/doc/spell.txt | 61 +++++----- runtime/doc/syntax.txt | 12 +- runtime/doc/tagsrch.txt | 32 ++--- runtime/doc/tui.txt | 215 +++++++++++++++++----------------- runtime/doc/usr_05.txt | 1 - runtime/doc/usr_10.txt | 11 +- runtime/doc/usr_22.txt | 11 +- runtime/doc/usr_27.txt | 4 +- runtime/doc/usr_29.txt | 25 ++-- runtime/doc/usr_30.txt | 15 ++- runtime/doc/usr_40.txt | 11 +- runtime/doc/usr_45.txt | 10 +- runtime/doc/vimeval.txt | 14 +-- runtime/doc/vimfn.txt | 3 +- runtime/doc/windows.txt | 65 +++++----- runtime/lua/vim/_meta/options.gen.lua | 4 +- runtime/lua/vim/_meta/tui.lua | 3 +- runtime/lua/vim/_meta/vimfn.gen.lua | 2 +- runtime/queries/vimdoc/highlights.scm | 2 +- src/gen/gen_eval_files.lua | 1 + src/gen/gen_help_html.lua | 27 ++++- src/gen/gen_vimdoc.lua | 29 ++--- src/nvim/eval.lua | 2 +- src/nvim/options.lua | 4 +- 37 files changed, 518 insertions(+), 529 deletions(-) diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt index 72ebb9e215..f8a4ceb137 100644 --- a/runtime/doc/api.txt +++ b/runtime/doc/api.txt @@ -111,7 +111,7 @@ typedefs around C99 standard types, others are Nvim-defined data structures. Basic types ~ API Type C type ~ - Nil + Nil   Boolean bool Integer (signed 64-bit integer) int64_t Float (IEEE 754 double precision) double diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index b6dfb50a5b..a648a1916b 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -799,38 +799,38 @@ The substitution is limited in recursion to 4 levels. *E1290* Otherwise these characters in {string} have a special meaning: -magic nomagic action ~ - & \& replaced with the whole matched pattern *s/\&* - \& & replaced with & - \0 replaced with the whole matched pattern *\0* *s/\0* - \1 replaced with the matched pattern in the first - pair of () *s/\1* - \2 replaced with the matched pattern in the second - pair of () *s/\2* - .. .. *s/\3* - \9 replaced with the matched pattern in the ninth - pair of () *s/\9* - ~ \~ replaced with the {string} of the previous - substitute *s~* - \~ ~ replaced with ~ *s/\~* - \u next character made uppercase *s/\u* - \U following characters made uppercase, until \E *s/\U* - \l next character made lowercase *s/\l* - \L following characters made lowercase, until \E *s/\L* - \e end of \u, \U, \l and \L (NOTE: not !) *s/\e* - \E end of \u, \U, \l and \L *s/\E* - split line in two at this point - (Type the as CTRL-V ) *s* - \r idem *s/\r* - \ insert a carriage-return (CTRL-M) - (Type the as CTRL-V ) *s/\* - \n insert a ( in the file) - (does NOT break the line) *s/\n* - \b insert a *s/\b* - \t insert a *s/\t* - \\ insert a single backslash *s/\\* - \x where x is any character not mentioned above: - Reserved for future expansion +  magic nomagic action ~ +*s/\&* & \& replaced with the whole matched pattern +  \& & replaced with & +*\0* *s/\0* \0 \0 replaced with the whole matched pattern +*s/\1* \1 \1 replaced with the matched pattern in the first + pair of () +*s/\2* \2 \2 replaced with the matched pattern in the second + pair of () +*s/\3* .. .. .. +*s/\9* \9 \9 replaced with the matched pattern in the ninth + pair of () +*s~* ~ \~ replaced with the {string} of the previous + substitute +*s/\~* \~ ~ replaced with ~ +*s/\u* \u \u next character made uppercase +*s/\U* \U \U following characters made uppercase, until \E +*s/\l* \l \l next character made lowercase +*s/\L* \L \L following characters made lowercase, until \E +*s/\e* \e \e end of \u, \U, \l and \L (NOTE: not !) +*s/\E* \E \E end of \u, \U, \l and \L +*s* split line in two at this point + (Type the as CTRL-V ) +*s/\r* \r \r idem +*s/\* \ \ insert a carriage-return (CTRL-M) + (Type the as CTRL-V ) +*s/\n* \n \n insert a ( in the file) + (does NOT break the line) +*s/\b* \b \b insert a +*s/\t* \t \t insert a +*s/\\* \\ \\ insert a single backslash +  \x \x where x is any character not mentioned above: + Reserved for future expansion The special meaning is also used inside the third argument {sub} of the |substitute()| function with the following exceptions: @@ -1670,7 +1670,7 @@ You can use the 'formatoptions' option to influence how Vim formats text. 'formatoptions' is a string that can contain any of the letters below. You can separate the option letters with commas for readability. -letter meaning when present in 'formatoptions' ~ +letter meaning when present in 'formatoptions' ~ *fo-t* t Auto-wrap text using 'textwidth' *fo-c* diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index e7bf1ad8f3..c79510a981 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -135,7 +135,7 @@ When the same extension is used for multiple filetypes, Vim tries to guess what kind of file it is. This doesn't always work. A number of global variables can be used to overrule the filetype used for certain extensions: - file name variable ~ + file name variable   ~ `*.al` g:filetype_al `*.app` g:filetype_app `*.as` g:filetype_as diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 19efda949b..80d0dfdad7 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -169,63 +169,58 @@ Overview of what the mouse buttons do, when 'mousemodel' is "extend": ** ** ** ** ** ** -Normal Mode: > - event position selection change action - cursor window - --------------------------------------------------------------------------- - yes end yes - no no change no toggle multicursor - yes no change yes "*" (2) - yes start or extend (1) no - yes start or extend (1) no - yes if not active no put - yes if active no yank and put - yes start or extend yes - yes start or extend blockw. yes - yes no change yes "#" (2) - no no change no "CTRL-T" - yes extend no - yes extend no - -Insert or Replace Mode: > - event position selection change action - cursor window - --------------------------------------------------------------------------- - yes (cannot be active) yes - no (cannot be active) no no-op - yes (cannot be active) yes "CTRL-O*" (2) - yes start or extend (1) no like CTRL-O (1) - yes start or extend (1) no like CTRL-O (1) - no (cannot be active) no put register - yes start or extend yes like CTRL-O - yes start or extend blockw. yes - yes (cannot be active) yes "CTRL-O#" (2) - no (cannot be active) no "CTRL-O CTRL-T" - -In a help window: > - event position selection change action - cursor window - --------------------------------------------------------------------------- - <2-LeftMouse> yes (cannot be active) no "^]" (jump to help tag) +Normal Mode: + + event position cursor selection change window action ~ + yes end yes + no no change no toggle multicursor + yes no change yes "*" (2) + yes start or extend (1) no + yes start or extend (1) no + yes if not active no put + yes if active no yank and put + yes start or extend yes + yes start or extend blockw. yes + yes no change yes "#" (2) + no no change no "CTRL-T" + yes extend no + yes extend no + +Insert or Replace Mode: + + event position cursor selection change window action ~ + yes (cannot be active) yes + no (cannot be active) no no-op + yes (cannot be active) yes "CTRL-O*" (2) + yes start or extend (1) no like CTRL-O (1) + yes start or extend (1) no like CTRL-O (1) + no (cannot be active) no put register + yes start or extend yes like CTRL-O + yes start or extend blockw. yes + yes (cannot be active) yes "CTRL-O#" (2) + no (cannot be active) no "CTRL-O CTRL-T" + +In a help window: + + event position cursor selection change window action ~ + <2-LeftMouse> yes (cannot be active) no "^]" (jump to help tag) When 'mousemodel' is "popup", these are different: ** -Normal Mode: > - event position selection change action - cursor window - --------------------------------------------------------------------------- - yes start or extend (1) no - yes start/extend blockw no - no popup menu no - -Insert or Replace Mode: > - event position selection change action - cursor window - --------------------------------------------------------------------------- - yes start or extend (1) no like CTRL-O (1) - yes start/extend blockw no - no popup menu no +Normal Mode: + + event position cursor selection change window action ~ + yes start or extend (1) no + yes start/extend blockw no + no popup menu no + +Insert or Replace Mode: + + event position cursor selection change window action ~ + yes start or extend (1) no like CTRL-O (1) + yes start/extend blockw no + no popup menu no (1) only if mouse pointer moved since press (2) only if click is in same buffer @@ -257,13 +252,12 @@ alt key is pressed (it may move the window). *double-click* *<2-LeftMouse>* *<3-LeftMouse>* *<4-LeftMouse>* Double, triple and quadruple clicks are supported. For selecting text, extra -clicks extend the selection: > +clicks extend the selection: - click select - --------------------------------- - double word or % match - triple line - quadruple rectangular block + click select ~ + double word or % match + triple line + quadruple rectangular block Exception: In a :help window, double-click jumps to help for the word that is clicked on. @@ -292,24 +286,24 @@ This is like using CTRL-O in Insert mode. Select mode is used when the *X1Mouse* *X1Drag* *X1Release* *X2Mouse* *X2Drag* *X2Release* ** ** -Mouse clicks can be mapped using these |keycodes|: > - code mouse button normal action - --------------------------------------------------------------------------- - left pressed set cursor position - left moved while pressed extend selection - left released set selection end - middle pressed paste text at cursor position - middle moved while pressed - - middle released - - right pressed extend selection - right moved while pressed extend selection - right released set selection end - X1 button pressed - - X1 moved while pressed - - X1 button release - - X2 button pressed - - X2 moved while pressed - - X2 button release - +Mouse clicks can be mapped using these |keycodes|: + + code mouse button normal action ~ + left pressed set cursor position + left moved while pressed extend selection + left released set selection end + middle pressed paste text at cursor position + middle moved while pressed - + middle released - + right pressed extend selection + right moved while pressed extend selection + right released set selection end + X1 button pressed - + X1 moved while pressed - + X1 button release - + X2 button pressed - + X2 moved while pressed - + X2 button release - The X1 and X2 buttons refer to the extra buttons found on some mice (e.g. the right thumb). diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 0bfe243ea2..e05575f74a 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -40,14 +40,14 @@ Tag Char Insert-mode action ~ |i_CTRL-G_u| CTRL-G u start new undoable edit |i_CTRL-G_U| CTRL-G U don't break undo with next cursor movement |i_| delete character before the cursor -|i_digraph| {char1}{char2} +|i_digraph| {char1}{char2}   enter digraph (only when 'digraph' option set) |i_CTRL-H| CTRL-H same as |i_| insert a character |i_CTRL-I| CTRL-I same as |i_| same as |i_CTRL-J| CTRL-J same as -|i_CTRL-K| CTRL-K {char1} {char2} +|i_CTRL-K| CTRL-K {char1} {char2}   enter digraph |i_| begin new line |i_CTRL-M| CTRL-M same as @@ -61,7 +61,7 @@ Tag Char Insert-mode action ~ control flow |i_CTRL-SHIFT-Q| CTRL-SHIFT-Q {char} like CTRL-Q unless |tui-modifyOtherKeys| is active -|i_CTRL-R| CTRL-R {register} +|i_CTRL-R| CTRL-R {register}   insert the contents of a register |i_CTRL-R_CTRL-R| CTRL-R CTRL-R {register} insert the contents of a register literally @@ -86,20 +86,25 @@ Tag Char Insert-mode action ~ |i_CTRL-Y| CTRL-Y insert the character which is above the cursor |i_| end insert mode |i_CTRL-[| CTRL-[ same as -|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N go to Normal mode -|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode +|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N go to Normal mode +|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode   CTRL-\ a - z reserved for extensions   CTRL-\ others not used |i_CTRL-]| CTRL-] trigger abbreviation |i_CTRL-^| CTRL-^ toggle use of |:lmap| mappings |i_CTRL-_| CTRL-_ When 'allowrevins' set: toggle 'revins' + -----------------------------------------------------------------------------   to '~' not used, except '0' and '^' followed by CTRL-D + ----------------------------------------------------------------------------- |i_0_CTRL-D| 0 CTRL-D delete all indent in the current line |i_^_CTRL-D| ^ CTRL-D delete all indent in the current line, restore it in the next line + ----------------------------------------------------------------------------- |i_| delete character under the cursor + -----------------------------------------------------------------------------   Meta characters (0x80 to 0xff, 128 to 255) not used + ----------------------------------------------------------------------------- |i_| cursor one character left |i_| cursor one word left |i_| cursor one word left @@ -127,7 +132,7 @@ Tag Char Insert-mode action ~ |i_| move window six columns left |i_| move window one page left |i_| move window six columns right -|i_| move window one page right +|i_| move window one page right commands in CTRL-X submode *i_CTRL-X_index* @@ -227,8 +232,9 @@ Tag Char Note Normal-mode action ~ |CTRL-| CTRL- same as `g` : go to last accessed tab page   CTRL-_ not used + ----------------------------------------------------------------------------- || 1 same as "l" -|!| !{motion}{filter} +|!| !{motion}{filter}   2 filter Nmove text through the {filter} command |!!| !!{filter} 2 filter N lines through the {filter} command @@ -430,7 +436,7 @@ Tag Char Note Normal-mode action ~ || 1 same as "b" || place a multicursor at mouse-click || 1 same as "w" -|| same as "CTRL-T" +|| same as "CTRL-T" || same as "g" || ["x] 2 same as "x" |N| {count} remove the last digit from {count} @@ -452,7 +458,7 @@ Tag Char Note Normal-mode action ~ || 1 same as "b" || same as "*" at the mouse click position || 1 same as "w" -|| same as "#" at the mouse click position +|| same as "#" at the mouse click position || 1 same as CTRL-B || 2 same as "u" || 1 same as "k" @@ -607,7 +613,7 @@ Tag Command Normal-mode action ~ |CTRL-W_| CTRL-W same as "CTRL-W j" |CTRL-W_| CTRL-W same as "CTRL-W k" |CTRL-W_| CTRL-W same as "CTRL-W h" -|CTRL-W_| CTRL-W same as "CTRL-W l" +|CTRL-W_| CTRL-W same as "CTRL-W l" ============================================================================== 2.3 Square bracket commands *[* *]* @@ -658,7 +664,8 @@ Tag Char Note Normal-mode action ~ |[s| [s 1 move to the previous misspelled word |[z| [z 1 move to start of open fold |[{| [{ 1 cursor N times back to unmatched '{' -|[| [ 2 same as "[p" +|[| [ 2 same as "[p" + ----------------------------------------------------------------------------- |]_CTRL-D| ] CTRL-D jump to first #define found in current and included files matching the word under the cursor, start searching at cursor position @@ -698,7 +705,7 @@ Tag Char Note Normal-mode action ~ |]s| ]s 1 move to next misspelled word |]z| ]z 1 move to end of open fold |]}| ]} 1 cursor N times forward to unmatched '}' -|]| ] 2 same as "]p" +|]| ] 2 same as "]p" ============================================================================== 2.4 Commands starting with 'g' *g* @@ -894,8 +901,8 @@ here are those that are different. Tag Command Note Visual-mode action ~ ------------------------------------------------------------------------------ ~ -|v_CTRL-\_CTRL-N| CTRL-\ CTRL-N stop Visual mode -|v_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode +|v_CTRL-\_CTRL-N| CTRL-\ CTRL-N stop Visual mode +|v_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode |v_CTRL-A| CTRL-A 2 add N to number in highlighted text |v_CTRL-C| CTRL-C stop Visual mode |v_CTRL-G| CTRL-G toggle between Visual mode and Select mode @@ -1027,7 +1034,7 @@ Tag Command Command-line editing-mode action ~ command-line window; otherwise not used |c_CTRL-G| CTRL-G next match when 'incsearch' is active |c_| delete the character in front of the cursor -|c_digraph| {char1} {char2} +|c_digraph| {char1} {char2}   enter digraph when 'digraph' is on |c_CTRL-H| CTRL-H same as |c_| if 'wildchar' is : Do completion on @@ -1038,7 +1045,7 @@ Tag Command Command-line editing-mode action ~ |c_CTRL-I| CTRL-I same as |c_| same as |c_CTRL-J| CTRL-J same as -|c_CTRL-K| CTRL-K {char1} {char2} +|c_CTRL-K| CTRL-K {char1} {char2}   enter digraph |c_CTRL-L| CTRL-L do completion on the pattern in front of the cursor and insert the longest common part @@ -1053,7 +1060,7 @@ Tag Command Command-line editing-mode action ~ command-line from history. |c_CTRL-Q| CTRL-Q same as CTRL-V, unless it's used for terminal control flow -|c_CTRL-R| CTRL-R {regname} +|c_CTRL-R| CTRL-R {regname}   insert the contents of a register or object under the cursor as if typed |c_CTRL-R_CTRL-R| CTRL-R CTRL-R {regname} @@ -1072,16 +1079,17 @@ Tag Command Command-line editing-mode action ~   CTRL-Z not used (reserved for suspend) |c_| abandon command-line without executing it |c_CTRL-[| CTRL-[ same as -|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N go to Normal mode, abandon command-line -|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode, abandon command-line +|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N go to Normal mode, abandon command-line +|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G go to Normal mode, abandon command-line   CTRL-\ a - d reserved for extensions -|c_CTRL-\_e| CTRL-\ e {expr} replace the command line with the result of +|c_CTRL-\_e| CTRL-\ e {expr} replace the command line with the result of {expr}   CTRL-\ f - z reserved for extensions   CTRL-\ others not used |c_CTRL-]| CTRL-] trigger abbreviation |c_CTRL-^| CTRL-^ toggle use of |:lmap| mappings |c_| delete the character under the cursor + ----------------------------------------------------------------------------- |c_| cursor left |c_| cursor one word left |c_| cursor one word left diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 5b5febe2bf..e498c9d000 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -32,8 +32,8 @@ If you are working in a special language mode when inserting text, see the 'langmap' option, 'langmap', on how to avoid switching this mode on and off all the time. -char action ~ ------------------------------------------------------------------------ +char action ~ +----------------------------------------------------------------------- ~ *i_CTRL-[* *i_* or CTRL-[ End insert or Replace mode, go back to Normal mode. Finish abbreviation. @@ -267,7 +267,7 @@ CTRL-] Trigger abbreviation, without inserting a character. *i_* Toggle between Insert and Replace mode. ------------------------------------------------------------------------ +----------------------------------------------------------------------- ~ *i_backspacing* The effect of the , CTRL-W, and CTRL-U depend on the 'backspace' option (unless 'revins' is set). This is a comma-separated list of items: @@ -292,12 +292,12 @@ With CTRL-V the decimal, octal or hexadecimal value of a character can be entered directly. This way you can enter any character, except a line break (, value 10). There are five ways to enter the character value: -first char mode max nr of chars max value ~ -(none) decimal 3 255 -o or O octal 3 377 (255) -x or X hexadecimal 2 ff (255) -u hexadecimal 4 ffff (65535) -U hexadecimal 8 7fffffff (2147483647) +first char mode max nr of chars max value ~ +(none) decimal 3 255 +o or O octal 3 377 (255) +x or X hexadecimal 2 ff (255) +u hexadecimal 4 ffff (65535) +U hexadecimal 8 7fffffff (2147483647) Normally you would type the maximum number of characters. Thus to enter a space (value 32) you would type 032. You can omit the leading zero, in @@ -351,47 +351,47 @@ including cursor-moves. After a jump (mouse, scroll, , …) only the last change can be redone, and it behaves like an "i" command. The |quote.| register always holds just the text typed after the last cursor-move. -char action ~ ------------------------------------------------------------------------ - cursor one line up *i_* - cursor one line down *i_* +char action tag ~ +----------------------------------------------------------------------- ~ + cursor one line up *i_* + cursor one line down *i_* CTRL-G cursor one line up, insert start column *i_CTRL-G_* CTRL-G k cursor one line up, insert start column *i_CTRL-G_k* CTRL-G CTRL-K cursor one line up, insert start column *i_CTRL-G_CTRL-K* -CTRL-G cursor one line down, insert start column *i_CTRL-G_* -CTRL-G j cursor one line down, insert start column *i_CTRL-G_j* -CTRL-G CTRL-J cursor one line down, insert start column *i_CTRL-G_CTRL-J* - cursor one character left *i_* - cursor one character right *i_* +CTRL-G cursor one line down, insert start column *i_CTRL-G_* +CTRL-G j cursor one line down, insert start column *i_CTRL-G_j* +CTRL-G CTRL-J cursor one line down, insert start column *i_CTRL-G_CTRL-J* + cursor one character left *i_* + cursor one character right *i_* cursor one word back (like "b" command) *i_* cursor one word back (like "b" command) *i_* - cursor one word forward (like "w" command) *i_* - cursor one word forward (like "w" command) *i_* + cursor one word forward (like "w" command) *i_* + cursor one word forward (like "w" command) *i_* cursor to first char in the line *i_* cursor to after last char in the line *i_* cursor to first char in the file *i_* cursor to after last char in the file *i_* cursor to position of mouse click *i_* - move window one page up *i_* - move window one page up *i_* - move window one page down *i_* - move window one page down *i_* - move window three lines down *i_* - move window one page down *i_* - move window three lines up *i_* - move window one page up *i_* - move window six columns left *i_* - move window one page left *i_* - move window six columns right *i_* - move window one page right *i_* -CTRL-O execute one command, return to Insert mode *i_CTRL-O* + move window one page up *i_* + move window one page up *i_* + move window one page down *i_* + move window one page down *i_* + move window three lines down *i_* + move window one page down *i_* + move window three lines up *i_* + move window one page up *i_* + move window six columns left *i_* + move window one page left *i_* + move window six columns right *i_* + move window one page right *i_* +CTRL-O execute one command, return to Insert mode *i_CTRL-O* CTRL-\ CTRL-O like CTRL-O but don't move the cursor *i_CTRL-\_CTRL-O* CTRL-G u close undo sequence, start new change *i_CTRL-G_u* -CTRL-G U don't start a new undo block with the next *i_CTRL-G_U* - left/right cursor movement, if the cursor - stays within the same line +CTRL-G U don't start a new undo block with the next *i_CTRL-G_U* +  left/right cursor movement, if the cursor +  stays within the same line ------------------------------------------------------------------------ +----------------------------------------------------------------------- ~ The CTRL-O command sometimes has a side effect: If the cursor was beyond the end of the line, it will be put on the last character in the line. In @@ -2161,20 +2161,20 @@ self explanatory. Using the long or the short version depends on the long short meaning ~ [readonly] {RO} the file is write protected - [fifo/socket] using a stream - [fifo] using a fifo stream - [socket] using a socket stream - [CR missing] reading with "dos" 'fileformat' and a + [fifo/socket]   using a stream + [fifo]   using a fifo stream + [socket]   using a socket stream + [CR missing]   reading with "dos" 'fileformat' and a NL without a preceding CR was found. - [NL found] reading with "mac" 'fileformat' and a + [NL found]   reading with "mac" 'fileformat' and a NL was found (could be "unix" format) - [long lines split] at least one line was split in two - [NOT converted] conversion from 'fileencoding' to + [long lines split]   at least one line was split in two + [NOT converted]   conversion from 'fileencoding' to 'encoding' was desired but not possible - [converted] conversion from 'fileencoding' to + [converted]   conversion from 'fileencoding' to 'encoding' done - [READ ERRORS] not all of the file could be read + [READ ERRORS]   not all of the file could be read vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index ca48ca350a..5d254cdd6e 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -409,12 +409,11 @@ t[nore]map | - | - | - | - | - | - | yes | - | l[nore]map | - | yes | yes | - | - | - | - | yes | - COMMANDS MODES ~ - Normal Visual+Select Operator-pending ~ -:map :noremap :unmap :mapclear yes yes yes -:nmap :nnoremap :nunmap :nmapclear yes - - -:vmap :vnoremap :vunmap :vmapclear - yes - -:omap :onoremap :ounmap :omapclear - - yes +COMMANDS Normal Visual+Select Op-pending ~ +:map :noremap :unmap :mapclear yes yes yes +:nmap :nnoremap :nunmap :nmapclear yes - - +:vmap :vnoremap :vunmap :vmapclear - yes - +:omap :onoremap :ounmap :omapclear - - yes :nunmap can also be used outside of a monastery. *mapmode-x* *mapmode-s* @@ -425,21 +424,19 @@ NOTE: Mapping a printable character in Select mode may confuse the user. It's better to explicitly use :xmap and :smap for printable characters. Or use :sunmap after defining the mapping. - COMMANDS MODES ~ - Visual Select ~ -:vmap :vnoremap :vunmap :vmapclear yes yes -:xmap :xnoremap :xunmap :xmapclear yes - -:smap :snoremap :sunmap :smapclear - yes +COMMANDS Visual Select ~ +:vmap :vnoremap :vunmap :vmapclear yes yes +:xmap :xnoremap :xunmap :xmapclear yes - +:smap :snoremap :sunmap :smapclear - yes *mapmode-ic* *mapmode-i* *mapmode-c* *mapmode-l* Some commands work both in Insert mode and Command-line mode, some not: - COMMANDS MODES ~ - Insert Command-line Lang-Arg ~ -:map! :noremap! :unmap! :mapclear! yes yes - -:imap :inoremap :iunmap :imapclear yes - - -:cmap :cnoremap :cunmap :cmapclear - yes - -:lmap :lnoremap :lunmap :lmapclear yes* yes* yes* +COMMANDS Insert Command-line Lang-Arg ~ +:map! :noremap! :unmap! :mapclear! yes yes - +:imap :inoremap :iunmap :imapclear yes - - +:cmap :cnoremap :cunmap :cmapclear - yes - +:lmap :lnoremap :lunmap :lmapclear yes* yes* yes* * If 'iminsert' is 1, see |language-mapping| below. @@ -1299,10 +1296,10 @@ When 'verbose' is non-zero, listing a command will also display where it was last defined and any completion argument. Example: > :verbose command TOhtml -< Name Args Range Complete Definition ~ - TOhtml 0 % :call Convert2HTML(, ) ~ - Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim ~ - + Name Args Range Complete Definition + TOhtml 0 % :call Convert2HTML(, ) + Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim +< See |:verbose-cmd| for more information. *E174* *E182* diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 6788588f40..7f41cf07d6 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -473,35 +473,34 @@ HEBREW KEYMAP *keymap-hebrew* This file explains what characters are available in UTF-8 and CP1255 encodings, and what the keymaps are to get those characters: -glyph encoding keymap ~ -Char UTF-8 cp1255 hebrew hebrewp name ~ -א 0x5d0 0xe0 t a alef -ב 0x5d1 0xe1 c b bet -ג 0x5d2 0xe2 d g gimel -ד 0x5d3 0xe3 s d dalet -ה 0x5d4 0xe4 v h he -ו 0x5d5 0xe5 u v vav -ז 0x5d6 0xe6 z z zayin -ח 0x5d7 0xe7 j j het -ט 0x5d8 0xe8 y T tet -י 0x5d9 0xe9 h y yod -ך 0x5da 0xea l K kaf sofit -כ 0x5db 0xeb f k kaf -ל 0x5dc 0xec k l lamed -ם 0x5dd 0xed o M mem sofit -מ 0x5de 0xee n m mem -ן 0x5df 0xef i N nun sofit -נ 0x5e0 0xf0 b n nun -ס 0x5e1 0xf1 x s samech -ע 0x5e2 0xf2 g u ayin -ף 0x5e3 0xf3 ; P pe sofit -פ 0x5e4 0xf4 p p pe -ץ 0x5e5 0xf5 . X tsadi sofit -צ 0x5e6 0xf6 m x tsadi -ק 0x5e7 0xf7 e q qof -ר 0x5e8 0xf8 r r resh -ש 0x5e9 0xf9 a w shin -ת 0x5ea 0xfa , t tav +Char UTF-8 cp1255 hebrew hebrewp name ~ +א 0x5d0 0xe0 t a alef +ב 0x5d1 0xe1 c b bet +ג 0x5d2 0xe2 d g gimel +ד 0x5d3 0xe3 s d dalet +ה 0x5d4 0xe4 v h he +ו 0x5d5 0xe5 u v vav +ז 0x5d6 0xe6 z z zayin +ח 0x5d7 0xe7 j j het +ט 0x5d8 0xe8 y T tet +י 0x5d9 0xe9 h y yod +ך 0x5da 0xea l K kaf sofit +כ 0x5db 0xeb f k kaf +ל 0x5dc 0xec k l lamed +ם 0x5dd 0xed o M mem sofit +מ 0x5de 0xee n m mem +ן 0x5df 0xef i N nun sofit +נ 0x5e0 0xf0 b n nun +ס 0x5e1 0xf1 x s samech +ע 0x5e2 0xf2 g u ayin +ף 0x5e3 0xf3 ; P pe sofit +פ 0x5e4 0xf4 p p pe +ץ 0x5e5 0xf5 . X tsadi sofit +צ 0x5e6 0xf6 m x tsadi +ק 0x5e7 0xf7 e q qof +ר 0x5e8 0xf8 r r resh +ש 0x5e9 0xf9 a w shin +ת 0x5ea 0xfa , t tav Vowel marks and special punctuation: הְ 0x5b0 0xc0 A: A: sheva diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 896ba24236..a3038e379c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1846,7 +1846,7 @@ A jump table for the options with a short description can be found at |Q_op|. To avoid problems with flags that are added in the future, use the "+=" and "-=" feature of ":set" |add-option-flags|. - contains behavior ~ + contains behavior ~ *cpo-a* a When included, a ":read" command with a file name argument will set the alternate file name for the @@ -6441,7 +6441,7 @@ A jump table for the options with a short description can be found at |Q_op|. is 2 or 3) is controlling the output of |CTRL-G|. field meaning ~ - - Left justify the item. The default is right justified + `-` Left justify the item. The default is right justified when minwid is larger than the length of the item. 0 Leading zeroes in numeric items. Overridden by "-". minwid Minimum width of the item, padding as set by "-" & "0". diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 8d816471ab..e851065821 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -484,7 +484,7 @@ Overview of ordinary atoms. */ordinary-atom* More explanation and examples below, follow the links. ordinary atom ~ - magic nomagic matches ~ +  magic nomagic matches ~ |/^| ^ ^ start-of-line (at start of pattern) |/zero-width| |/\^| \^ \^ literal '^' |/\_^| \_^ \_^ start-of-line (used anywhere) |/zero-width| @@ -507,7 +507,7 @@ More explanation and examples below, follow the links. |/\%v| \%23v \%23v in virtual column 23 |/zero-width| Character classes: */character-classes* - magic nomagic matches ~ +  magic nomagic matches ~ |/\i| \i \i identifier character (see 'isident' option) |/\I| \I \I like "\i", but excluding digits |/\k| \k \k keyword character (see 'iskeyword' option) @@ -538,7 +538,7 @@ Character classes: */character-classes* class with end-of-line included (end of character classes) - magic nomagic matches ~ +  magic nomagic matches ~ |/\e| \e \e |/\t| \t \t |/\r| \r \r @@ -564,7 +564,7 @@ Character classes: */character-classes* |/\Z| \Z \Z ignore differences in Unicode "combining characters". Useful when searching voweled Hebrew or Arabic text. - magic nomagic matches ~ +  magic nomagic matches ~ |/\m| \m \m 'magic' on for the following chars in the pattern |/\M| \M \M 'magic' off for the following chars in the pattern |/\v| \v \v the following chars in the pattern are "very magic" diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index aec8c4924f..d165d4cf96 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1987,13 +1987,12 @@ These can be used with '+' and '-', see |efm-ignore| below. Using "\n" in the pattern won't work to match multi-line messages. Example: Your compiler happens to write out errors in the following format -(leading line numbers not being part of the actual output): - - 1 Error 275 ~ - 2 line 42 ~ - 3 column 3 ~ - 4 ' ' expected after '--' ~ - +(leading line numbers not being part of the actual output): > + 1 Error 275 + 2 line 42 + 3 column 3 + 4 ' ' expected after '--' +< The appropriate error format string has to look like this: > :set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 78dd7cd676..15b9474eb8 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -129,7 +129,7 @@ N is used to indicate an optional count that can be given before the command. |pattern| Special characters in search patterns - meaning magic nomagic ~ + meaning magic nomagic ~ matches any single character . \. matches start of line ^ ^ matches $ $ diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index ad131a2e2a..993c634511 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -51,7 +51,7 @@ including getchar() input. This is signficant: it reflects the semantic intent. `CmdAtom.keys` reveals the low-level internal commands that were produced. - INPUT (`lhs`) RESOLUTION (`keys`) ~ + INPUT (`lhs`) RESOLUTION (`keys`)   ~ dw "dw" Not translated. zfa{ "zfa{" Not an edit (`changed=false`). x "dl" Translated builtin. diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index f5d3eee7a9..7d196a2cfd 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -747,22 +747,21 @@ than Myspell is Hunspell ( https://hunspell.github.io ). WORD LIST FORMAT *spell-dic-format* -A short example, with line numbers: - - 1 1234 ~ - 2 aan ~ - 3 Als ~ - 4 Etten-Leur ~ - 5 et al. ~ - 6 's-Gravenhage ~ - 7 's-Gravenhaags ~ - 8 # word that differs between regions ~ - 9 kado/1 ~ - 10 cadeau/2 ~ - 11 TCP,IP ~ - 12 /the S affix may add a 's' ~ - 13 bedel/S ~ - +A short example, with line numbers: > + 1 1234 + 2 aan + 3 Als + 4 Etten-Leur + 5 et al. + 6 's-Gravenhage + 7 's-Gravenhaags + 8 # word that differs between regions + 9 kado/1 + 10 cadeau/2 + 11 TCP,IP + 12 /the S affix may add a 's' + 13 bedel/S +< The first line contains the number of words. Vim ignores it, but you do get an error message if it's not there. *E760* @@ -1144,9 +1143,9 @@ This flag is not supported by Myspell. It has the meaning that case matters. This can be used if the word does not have the first letter in upper case at the start of a sentence. Example: - word list matches does not match ~ - 's morgens/= 's morgens 'S morgens 's Morgens 'S MORGENS - 's Morgens 's Morgens 'S MORGENS 'S morgens 's morgens +word list matches does not match ~ +'s morgens/= 's morgens 'S morgens 's Morgens 'S MORGENS +'s Morgens 's Morgens 'S MORGENS 'S morgens 's morgens The flag can also be used to avoid that the word matches when it is in all upper-case letters. @@ -1481,23 +1480,21 @@ SOUND-A-LIKE *spell-SAL* In the affix file SAL items can be used to define the sounds-a-like mechanism to be used. The main items define the "from" text and the "to" replacement. -Simplistic example: - - SAL CIA X ~ - SAL CH X ~ - SAL C K ~ - SAL K K ~ - +Simplistic example: > + SAL CIA X + SAL CH X + SAL C K + SAL K K +< There are a few rules and this can become quite complicated. An explanation how it works can be found in the Aspell manual: http://aspell.net/man-html/Phonetic-Code.html. -There are a few special items: - - SAL followup true ~ - SAL collapse_result true ~ - SAL remove_accents true ~ - +There are a few special items: > + SAL followup true + SAL collapse_result true + SAL remove_accents true +< "1" has the same meaning as "true". Any other value means "false". diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index eae3bb7cea..ea0f109993 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1009,7 +1009,7 @@ There are a couple of variables that have an effect on syntax highlighting, and are to do with non-standard highlighting options. Variable Default Effect ~ -g:doxygen_enhanced_color +g:doxygen_enhanced_color     g:doxygen_enhanced_colour 0 Use non-standard highlighting for doxygen comments. @@ -4568,11 +4568,11 @@ Examples: "ms=s+1", "hs=e-2", "lc=3". Although all offsets are accepted after any pattern, they are not always meaningful. This table shows which offsets are actually used: - ms me hs he rs re lc ~ -match item yes yes yes yes - - yes -region item start yes - yes - yes - yes -region item skip - yes - - - - yes -region item end - yes - yes - yes yes +  ms me hs he rs re lc ~ +match item yes yes yes yes - - yes +region item start yes - yes - yes - yes +region item skip - yes - - - - yes +region item end - yes - yes - yes yes Offsets can be concatenated, with a ',' in between. Example: > :syn match String /"[^"]*"/hs=s+1,he=e-1 diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index dd9b502cf4..40a097eb7e 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -419,22 +419,22 @@ If the tag is in the current file this will always work. Otherwise the performed actions depend on whether the current file was changed, whether a ! is added to the command and on the 'autowrite' and 'winfixbuf' options: - tag in file winfixbuf autowrite ~ -current file changed ! option option action ~ - ----------------------------------------------------------------------------- - yes x x off x goto tag - no no x off x read other file, goto tag - no yes yes off x abandon current file, - read other file, goto tag - no yes no off on write current file, - read other file, goto tag - no yes no off off fail - yes x yes x x goto tag - no no no on x fail - no yes no on x fail - no yes no on on fail - no yes no on off fail - ----------------------------------------------------------------------------- +in file changed ! winfixbuf autowrite action ~ +yes x x off x goto tag +no no x off x read other file, + goto tag +no yes yes off x abandon current file, + read other file, + goto tag +no yes no off on write current file, + read other file, + goto tag +no yes no off off fail +yes x yes x x goto tag +no no no on x fail +no yes no on x fail +no yes no on on fail +no yes no on off fail - If the tag is in the current file, the command will always work. - If the tag is in another file and the current file was not changed, the diff --git a/runtime/doc/tui.txt b/runtime/doc/tui.txt index 9da1b5f5ba..44b4fc290e 100644 --- a/runtime/doc/tui.txt +++ b/runtime/doc/tui.txt @@ -81,30 +81,27 @@ or sub-optimal behavior will result (scrolling quirks, wrong colors, etc.). $TERM is also important because it is forwarded by SSH to the remote session, unlike most other environment variables. -> - For this terminal Set $TERM to |builtin-terms| - ------------------------------------------------------------------------- - ansi (unknown) Y - Ghostty ghostty, xterm-ghostty Y - iTerm (original) iterm, iTerm.app N - iTerm2 (new capabilities) iterm2, iTerm2.app Y - Konsole konsole-256color N - libvte-based vte, vte-256color Y - (e.g. GNOME Terminal) (aliases: gnome, gnome-256color) - Linux virtual terminal linux, linux-256color Y - PuTTY putty, putty-256color Y - rxvt rxvt, rxvt-256color Y - screen screen, screen-256color Y - simple terminal (st) st, st-256color Y - Terminal.app nsterm N - tmux tmux, tmux-256color Y - Windows/ConEmu conemu Y - Windows/Cygwin-built Nvim cygwin Y - Windows/Interix interix Y - Windows/legacy console win32con Y - Windows/VTP console vtpcon Y - xterm or compatible xterm, xterm-256color Y -< + For this terminal Set $TERM to |builtin-terms| ~ + ansi (unknown) Y + Ghostty ghostty, xterm-ghostty Y + iTerm (original) iterm, iTerm.app N + iTerm2 (new capabilities) iterm2, iTerm2.app Y + Konsole konsole-256color N + libvte-based vte, vte-256color Y + (e.g. GNOME Terminal) (aliases: gnome, gnome-256color) + Linux virtual terminal linux, linux-256color Y + PuTTY putty, putty-256color Y + rxvt rxvt, rxvt-256color Y + screen screen, screen-256color Y + simple terminal (st) st, st-256color Y + Terminal.app nsterm N + tmux tmux, tmux-256color Y + Windows/ConEmu conemu Y + Windows/Cygwin-built Nvim cygwin Y + Windows/Interix interix Y + Windows/legacy console win32con Y + Windows/VTP console vtpcon Y + xterm or compatible xterm, xterm-256color Y *builtin-terms* *builtin_terms* Nvim will map |$TERM| to a builtin entry according to the above table if: @@ -320,91 +317,89 @@ Terminfo override *tui-termdefs* Below are the available fields in |$NVIM_TERMDEFS|. For keys of type `string[]`, the first entry is the unshifted variant of the key, and the second entry is -the shifted variant. > - - Field Type - ----------------------------------- - RGB bool - Su bool - Tc bool - back_color_erase bool - - columns int - lines int - max_colors int - - carriage_return string - change_scroll_region string - clear_screen string - clr_eol string - clr_eos string - cursor_address string - cursor_down string - cursor_home string - cursor_invisible string - cursor_left string - cursor_normal string - cursor_right string - cursor_up string - delete_line string - enter_blink_mode string - enter_bold_mode string - enter_ca_mode string - enter_dim_mode string - enter_italics_mode string - enter_reverse_mode string - enter_secure_mode string - enter_standout_mode string - enter_underline_mode string - erase_chars string - exit_attribute_mode string - exit_ca_mode string - from_status_line string - insert_line string - keypad_local string - keypad_xmit string - parm_delete_line string - parm_down_cursor string - parm_insert_line string - parm_left_cursor string - parm_right_cursor string - parm_up_cursor string - set_a_background string - set_a_foreground string - set_attributes string - set_lr_margin string - to_status_line string - - enter_strikethrough_mode string - reset_cursor_color string - reset_cursor_style string - set_cursor_color string - set_cursor_style string - set_rgb_background string - set_rgb_foreground string - set_underline_style string - - key_backspace string - key_btab string - key_clear string - key_npage string - key_ppage string - key_select string - - key_beg string[] - key_dc string[] - key_end string[] - key_find string[] - key_home string[] - key_ic string[] - key_left string[] - key_right string[] - key_suspend string[] - key_undo string[] - - key_f1 string - ... string - key_f63 string -< +the shifted variant. + + Field Type ~ + RGB bool + Su bool + Tc bool + back_color_erase bool + ------------------------------------ + columns int + lines int + max_colors int + ------------------------------------ + carriage_return string + change_scroll_region string + clear_screen string + clr_eol string + clr_eos string + cursor_address string + cursor_down string + cursor_home string + cursor_invisible string + cursor_left string + cursor_normal string + cursor_right string + cursor_up string + delete_line string + enter_blink_mode string + enter_bold_mode string + enter_ca_mode string + enter_dim_mode string + enter_italics_mode string + enter_reverse_mode string + enter_secure_mode string + enter_standout_mode string + enter_underline_mode string + erase_chars string + exit_attribute_mode string + exit_ca_mode string + from_status_line string + insert_line string + keypad_local string + keypad_xmit string + parm_delete_line string + parm_down_cursor string + parm_insert_line string + parm_left_cursor string + parm_right_cursor string + parm_up_cursor string + set_a_background string + set_a_foreground string + set_attributes string + set_lr_margin string + to_status_line string + ------------------------------------ + enter_strikethrough_mode string + reset_cursor_color string + reset_cursor_style string + set_cursor_color string + set_cursor_style string + set_rgb_background string + set_rgb_foreground string + set_underline_style string + ------------------------------------ + key_backspace string + key_btab string + key_clear string + key_npage string + key_ppage string + key_select string + ------------------------------------ + key_beg string[] + key_dc string[] + key_end string[] + key_find string[] + key_home string[] + key_ic string[] + key_left string[] + key_right string[] + key_suspend string[] + key_undo string[] + ------------------------------------ + key_f1 string + ... string + key_f63 string vim:tw=78:ts=8:sw=4:sts=4:et:ft=help:norl: diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 2bebc95ee7..c6ba2e186f 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -243,7 +243,6 @@ an archive or as a repository. For an archive you can follow these steps: ------------------------------------------------------------------------------ Adding nohlsearch package *nohlsearch-install* *package-nohlsearch* ------------------------------------------------------------------------------- Load the plugin with this command: > packadd nohlsearch diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index 69884b4b7a..0cfd87d60f 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -516,12 +516,11 @@ SHIFTING The command ">" shifts the selected text to the right one shift amount, inserting whitespace. The starting point for this shift is the left edge of the visual block. - With the same example again, ">" gives this result: - - This is a long line ~ - short ~ - Any other long line ~ - + With the same example again, ">" gives this result: > + This is a long line + short + Any other long line +< The shift amount is specified with the 'shiftwidth' option. To change it to use 4 spaces: > diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index f6edcefd80..125b49a4d1 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -258,12 +258,11 @@ shorter to type: > :ls -The output could look like this: - - 1 #h "help.txt" line 62 ~ - 2 %a + "usr_21.txt" line 1 ~ - 3 "usr_toc.txt" line 1 ~ - +The output could look like this: > + 1 #h "help.txt" line 62 + 2 %a + "usr_21.txt" line 1 + 3 "usr_toc.txt" line 1 +< The first column contains the buffer number. You can use this to edit the buffer without having to type the name, see below. After the buffer number come the flags. Then the name of the file diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index 3189b55dcd..e5f1664fa4 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -412,8 +412,8 @@ few more of these: \D non-digit [^0-9] \x hex digit [0-9a-fA-F] \X non-hex digit [^0-9a-fA-F] - \s white space [ ] ( and ) - \S non-white characters [^ ] (not and ) + \s white space [ \t] ( and ) + \S non-white characters [^ \t] (not and ) \l lowercase alpha [a-z] \L non-lowercase alpha [^a-z] \u uppercase alpha [A-Z] diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 11f9d86094..460e27e49a 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -173,19 +173,18 @@ one to jump to: > :tselect tagname -Vim will present you with a list of choices: - - # pri kind tag file ~ - 1 F f mch_init os_amiga.c ~ - mch_init() ~ - 2 F f mch_init os_mac.c ~ - mch_init() ~ - 3 F f mch_init os_msdos.c ~ - mch_init(void) ~ - 4 F f mch_init os_riscos.c ~ - mch_init() ~ - Enter nr of choice ( to abort): ~ - +Vim will present you with a list of choices: > + # pri kind tag file + 1 F f mch_init os_amiga.c + mch_init() + 2 F f mch_init os_mac.c + mch_init() + 3 F f mch_init os_msdos.c + mch_init(void) + 4 F f mch_init os_riscos.c + mch_init() + Enter nr of choice ( to abort): +< You can now enter the number (in the first column) of the match that you would like to jump to. The information in the other columns give you a good idea of where the match is defined. diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index 36b57c7afc..6d585f1a63 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -400,14 +400,13 @@ This adds one indent to the current block of lines, inside {}. The { and } lines themselves are left unmodified. ">a{" includes them. In this example the cursor is on "printf": - original text after ">i{" after ">a{" - - if (flag) if (flag) if (flag) ~ - { { { ~ - printf("yes"); printf("yes"); printf("yes"); ~ - flag = 0; flag = 0; flag = 0; ~ - } } } ~ - + original text after ">i{" after ">a{" > + if (flag) if (flag) if (flag) + { { { + printf("yes"); printf("yes"); printf("yes"); + flag = 0; flag = 0; flag = 0; + } } } +< ============================================================================== *30.5* Tabs and spaces diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index 19412be441..8991525de8 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -96,14 +96,13 @@ LISTING MAPPINGS To see the currently defined mappings, use ":map" without arguments. Or one of the variants that include the mode in which they work. The output could -look like this: - - _g :call MyGrep(1) ~ - v :s/^/> /:noh`` ~ - n :.,$s/^/> /:noh`` ~ +look like this: > + _g :call MyGrep(1) + v :s/^/> /:noh`` + n :.,$s/^/> /:noh`` - +< The first column of the list shows in which mode the mapping is effective. This is "n" for Normal mode, "i" for Insert mode, etc. A blank is used for a diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index 3e95535868..2dac54e140 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -362,11 +362,11 @@ LAST RESORT If all other methods fail, you can enter any character with CTRL-V: - encoding type range ~ - 8-bit CTRL-V 123 decimal 0-255 - 8-bit CTRL-V x a1 hexadecimal 00-ff - 16-bit CTRL-V u 013b hexadecimal 0000-ffff - 31-bit CTRL-V U 001303a4 hexadecimal 00000000-7fffffff + encoding type range ~ + 8-bit CTRL-V 123 decimal 0-255 + 8-bit CTRL-V x a1 hexadecimal 00-ff + 16-bit CTRL-V u 013b hexadecimal 0000-ffff + 31-bit CTRL-V U 001303a4 hexadecimal 00000000-7fffffff Don't type the spaces. See |i_CTRL-V_digit| for the details. diff --git a/runtime/doc/vimeval.txt b/runtime/doc/vimeval.txt index 28c675fc54..396f59650b 100644 --- a/runtime/doc/vimeval.txt +++ b/runtime/doc/vimeval.txt @@ -959,12 +959,11 @@ expr4 && expr4 .. logical AND *expr-&&* The "||" and "&&" operators take one argument on each side. The arguments are (converted to) Numbers. The result is: - input output ~ -n1 n2 n1 || n2 n1 && n2 ~ -|FALSE| |FALSE| |FALSE| |FALSE| -|FALSE| |TRUE| |TRUE| |FALSE| -|TRUE| |FALSE| |TRUE| |FALSE| -|TRUE| |TRUE| |TRUE| |TRUE| +n1 n2 n1 || n2 n1 && n2 ~ +|FALSE| |FALSE| |FALSE| |FALSE| +|FALSE| |TRUE| |TRUE| |FALSE| +|TRUE| |FALSE| |TRUE| |FALSE| +|TRUE| |TRUE| |TRUE| |TRUE| The operators can be concatenated, for example: > @@ -1324,9 +1323,8 @@ When using the lambda form there must be no white space between the } and the (. - *expr9* ------------------------------------------------------------------------------ -number +number *expr9* number number constant *expr-number* diff --git a/runtime/doc/vimfn.txt b/runtime/doc/vimfn.txt index d559fc80ae..c28d57b4c3 100644 --- a/runtime/doc/vimfn.txt +++ b/runtime/doc/vimfn.txt @@ -9,6 +9,7 @@ Vimscript functions *vimscript-functions* *builtin.txt* For functions grouped by what they are used for see |function-list|. Type |gO| to see the table of contents. + ============================================================================== 1. Details *vimscript-functions-details* @@ -6516,7 +6517,7 @@ mapcheck({name} [, {mode} [, {abbr}]]) *mapcheck()* A match happens with a mapping that starts with {name} and with a mapping which is equal to the start of {name}. - matches mapping "a" "ab" "abc" ~ + matches mapping "a" "ab" "abc" ~ mapcheck("a") yes yes yes mapcheck("abc") yes yes yes mapcheck("ax") yes no no diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 1a486bb515..cf05b600d9 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -47,11 +47,10 @@ inactive: The buffer is not displayed and does not contain anything. Options In a table: -state displayed loaded ":buffers" ~ - in window shows ~ -active yes yes 'a' -hidden no yes 'h' -inactive no no ' ' +state displayed in window loaded ":buffers" shows ~ +active yes yes 'a' +hidden no yes 'h' +inactive no no ' ' *buffer-reuse* Each buffer has a unique number and the number will not change within a Vim @@ -691,30 +690,29 @@ positions are stored and used to decide whether there was a change. ============================================================================== 7. Argument and buffer list commands *buffer-list* - args list buffer list meaning ~ -> - 1. :[N]argument [N] 11. :[N]buffer [N] to arg/buf N - 2. :[N]next [file ..] 12. :[N]bnext [N] to Nth next arg/buf - 3. :[N]Next [N] 13. :[N]bNext [N] to Nth previous arg/buf - 4. :[N]previous [N] 14. :[N]bprevious [N] to Nth previous arg/buf - 5. :rewind / :first 15. :brewind / :bfirst to first arg/buf - 6. :last 16. :blast to last arg/buf - 7. :all 17. :ball edit all args/buffers - 18. :unhide edit all loaded buffers - 19. :[N]bmod [N] to Nth modified buf -< - split & args list split & buffer list meaning ~ -> - 21. :[N]sargument [N] 31. :[N]sbuffer [N] split + to arg/buf N - 22. :[N]snext [file ..] 32. :[N]sbnext [N] split + to Nth next