From 60dca47ae4395eac100e7c2fc63b3a830c623260 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 6 Aug 2025 19:05:44 +0800 Subject: [PATCH 1/2] vim-patch:85cd509: runtime(doc): Use correct option-name tags closes: vim/vim#17857 https://github.com/vim/vim/commit/85cd509885a05c3a6bb029fb378b1295f107f8f6 Omit 'completepopup' and v:colornames. Co-authored-by: Hirohito Higashi --- runtime/doc/change.txt | 10 +++---- runtime/doc/diff.txt | 2 +- runtime/doc/editing.txt | 2 +- runtime/doc/ft_ada.txt | 12 ++++---- runtime/doc/ft_sql.txt | 8 ++--- runtime/doc/index.txt | 4 +-- runtime/doc/insert.txt | 12 ++++---- runtime/doc/intro.txt | 2 +- runtime/doc/map.txt | 10 +++---- runtime/doc/message.txt | 2 +- runtime/doc/motion.txt | 2 +- runtime/doc/options.txt | 49 +++++++++++++++---------------- runtime/doc/pattern.txt | 2 +- runtime/doc/quickfix.txt | 4 +-- runtime/doc/quickref.txt | 2 +- runtime/doc/spell.txt | 2 +- runtime/doc/starting.txt | 2 +- runtime/doc/syntax.txt | 6 ++-- runtime/doc/tabpage.txt | 4 +-- runtime/doc/userfunc.txt | 2 +- runtime/doc/various.txt | 4 +-- runtime/doc/vi_diff.txt | 10 +++---- runtime/doc/vietnamese.txt | 4 +-- runtime/doc/vimfn.txt | 14 ++++----- runtime/lua/vim/_meta/options.lua | 49 +++++++++++++++---------------- runtime/lua/vim/_meta/vimfn.lua | 14 ++++----- src/nvim/eval.lua | 14 ++++----- src/nvim/options.lua | 49 +++++++++++++++---------------- 28 files changed, 147 insertions(+), 150 deletions(-) diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 9ff2785b24..daed3d7016 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -22,13 +22,13 @@ For inserting text see |insert.txt|. "dl". The key does not take a [count]. Instead, it deletes the last character of the count. - See |'whichwrap'| for deleting a line break (join + See 'whichwrap' for deleting a line break (join lines). *X* *dh* ["x]X Delete [count] characters before the cursor [into register x] (not |linewise|). Does the same as "dh". - Also see |'whichwrap'|. + Also see 'whichwrap'. *d* ["x]d{motion} Delete text that {motion} moves over [into register @@ -583,9 +583,9 @@ with ".". Vim does not recognize a comment (starting with '"') after the ={motion} Filter {motion} lines through the external program given with the 'equalprg' option. When the 'equalprg' option is empty (this is the default), use the - internal formatting function |C-indenting| and - |'lisp'|. But when 'indentexpr' is not empty, it will - be used instead |indent-expression|. + internal formatting function |C-indenting| and 'lisp'. + But when 'indentexpr' is not empty, it will be used + instead |indent-expression|. *==* == Filter [count] lines like with ={motion}. diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 1ce7542f6c..fbaea83f93 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -448,7 +448,7 @@ Manually set two anchors using line numbers via buffer-local options: > ============================================================================== 6. Diff options *diff-options* -Also see |'diffopt'| and the "diff" item of |'fillchars'|. +Also see 'diffopt' and the "diff" item of 'fillchars'. *diff-slow* *diff_translations* For very long lines, the diff syntax highlighting might be slow, especially diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 3f9fc4e12a..a061b24ccf 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1356,7 +1356,7 @@ exist, the next-higher scope in the hierarchy applies. :cd[!] {path} Change the current directory to {path}. If {path} is relative, it is searched for in the - directories listed in |'cdpath'|. + directories listed in 'cdpath'. Clear any window-local directory. Does not change the meaning of an already opened file, because its full path name is remembered. Files from diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index fbb53d2711..3d94e427cf 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -76,8 +76,8 @@ The Ada plug-in provides support for: - user completion (|i_CTRL-X_CTRL-U|) - tag searches (|tagsrch.txt|) - Quick Fix (|quickfix.txt|) - - backspace handling (|'backspace'|) - - comment handling (|'comments'|, |'commentstring'|) + - backspace handling ('backspace') + - comment handling ('comments', 'commentstring') The plug-in only activates the features of the Ada mode whenever an Ada file is opened and adds Ada related entries to the main and pop-up menu. @@ -197,7 +197,7 @@ g:gnat.Project_File string *g:gnat.Make_Command* g:gnat.Make_Command string - External command used for |g:gnat.Make()| (|'makeprg'|). + External command used for |g:gnat.Make()| ('makeprg'). *g:gnat.Pretty_Program* g:gnat.Pretty_Program string @@ -213,7 +213,7 @@ g:gnat.Tags_Command string *g:gnat.Error_Format* g:gnat.Error_Format string - Error format (|'errorformat'|) + Error format ('errorformat') ------------------------------------------------------------------------------ 4.2 Dec Ada ~ @@ -243,11 +243,11 @@ g:decada.Unit_Name() function *g:decada.Make_Command* g:decada.Make_Command string - External command used for |g:decada.Make()| (|'makeprg'|). + External command used for |g:decada.Make()| ('makeprg'). *g:decada.Error_Format* g:decada.Error_Format string - Error format (|'errorformat'|). + Error format ('errorformat'). ============================================================================== 5. References ~ diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index 1dbac66db0..3c82e14368 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -172,7 +172,7 @@ with comments: > ------------------------------------------------------------------------------ 1.4 Macros *sql-macros* -Vim's feature to find macro definitions, |'define'|, is supported using this +Vim's feature to find macro definitions, 'define', is supported using this regular expression: > \c\<\(VARIABLE\|DECLARE\|IN\|OUT\|INOUT\)\> @@ -249,7 +249,7 @@ key to complete the optional parameter. After typing the function name and a space, you can use the completion to supply a parameter. The function takes the name of the Vim script you want to source. Using the |cmdline-completion| feature, the SQLSetType function will -search the |'runtimepath'| for all Vim scripts with a name containing "sql". +search the 'runtimepath' for all Vim scripts with a name containing "sql". This takes the guess work out of the spelling of the names. The following are examples: > :SQLSetType @@ -760,7 +760,7 @@ Step 1 ~ Begins by editing a Perl file. Vim automatically sets the filetype to "perl". By default, Vim runs the appropriate filetype file ftplugin/perl.vim. If you are using the syntax completion plugin by following -the directions at |ft-syntax-omni| then the |'omnifunc'| option has been set to +the directions at |ft-syntax-omni| then the 'omnifunc' option has been set to "syntax#Complete". Pressing will display the omni popup containing the syntax items for Perl. @@ -772,7 +772,7 @@ maps for SQL completion, see |sql-completion-maps|. Now these maps have been created and the SQL completion plugin has been initialized. All SQL syntax items have been cached in preparation. The SQL filetype script detects we are attempting to use two different completion plugins. Since the SQL maps -begin with , the maps will toggle the |'omnifunc'| when in use. So you +begin with , the maps will toggle the 'omnifunc' when in use. So you can use to continue using the completion for Perl (using the syntax completion plugin) and to use the SQL completion features. diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index c47d92a3f5..7afa0a2ecb 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -248,7 +248,7 @@ tag char note action in Normal mode ~ |&| & 2 repeat last :s |'| '{a-zA-Z0-9} 1 cursor to the first CHAR on the line with mark {a-zA-Z0-9} -|''| '' 1 cursor to the first CHAR of the line where +'' '' 1 cursor to the first CHAR of the line where the cursor was before the latest jump. |'(| '( 1 cursor to the first CHAR on the line of the start of the current sentence @@ -1017,7 +1017,7 @@ tag command action in Command-line editing mode ~ |c_CTRL-D| CTRL-D list completions that match the pattern in front of the cursor |c_CTRL-E| CTRL-E cursor to end of command-line -|'cedit'| CTRL-F default value for 'cedit': opens the +'cedit' CTRL-F default value for 'cedit': opens the 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 diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ee2c4577fa..6e6b9a41f3 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -29,7 +29,7 @@ use "CTRL-V 003" to insert a CTRL-C. Note: When CTRL-V is mapped you can often use CTRL-Q instead |i_CTRL-Q|. 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 +'langmap' option, 'langmap', on how to avoid switching this mode on and off all the time. char action ~ @@ -279,7 +279,7 @@ When 'backspace' is empty, Vi compatible backspacing is used. You cannot backspace over autoindent, before column 1 or before where insert started. For backwards compatibility the values "0", "1", "2" and "3" are also allowed, -see |'backspace'|. +see 'backspace'. If the 'backspace' option does contain "eol" and the cursor is in column 1 when one of the three keys is used, the current line is joined with the @@ -601,7 +601,7 @@ In 'list' mode, Virtual Replace mode acts as if it was not in 'list' mode, unless "L" is in 'cpoptions'. Note that the only situations for which characters beyond the cursor should -appear to move are in List mode |'list'|, and occasionally when 'wrap' is set +appear to move are in List mode 'list', and occasionally when 'wrap' is set (and the line changes length to become shorter or wider than the width of the screen). In other cases spaces may be inserted to avoid following characters to move. @@ -1117,11 +1117,11 @@ CTRL-X CTRL-Z Stop completion without changing the text. AUTOCOMPLETION *ins-autocompletion* Vim can display a completion menu as you type, similar to using |i_CTRL-N|, -but triggered automatically. See |'autocomplete'|. The menu items are -collected from the sources listed in the |'complete'| option. +but triggered automatically. See 'autocomplete'. The menu items are collected +from the sources listed in the 'complete' option. Unlike manual |i_CTRL-N| completion, this mode uses a decaying timeout to keep -Vim responsive. Sources earlier in the |'complete'| list are given more time +Vim responsive. Sources earlier in the 'complete' list are given more time (higher priority), but every source is guaranteed a time slice, however small. This mode is fully compatible with other completion modes. You can invoke diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 413433795e..b17b04a147 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -605,7 +605,7 @@ status messages will only be used if an option is on: > command characters 'showcmd' on off cursor position 'ruler' off off -The current mode is "-- INSERT --" or "-- REPLACE --", see |'showmode'|. The +The current mode is "-- INSERT --" or "-- REPLACE --", see 'showmode'. The command characters are those that you typed but were not used yet. If you have a slow terminal you can switch off the status messages to speed diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index c40d9d86fa..9330a088b5 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1390,13 +1390,13 @@ completion can be enabled: -complete=compiler compilers -complete=diff_buffer diff buffer names -complete=dir directory names - -complete=dir_in_path directory names in |'cdpath'| + -complete=dir_in_path directory names in 'cdpath' -complete=environment environment variable names -complete=event autocommand events -complete=expression Vim expression -complete=file file and directory names - -complete=file_in_path file and directory names in |'path'| - -complete=filetype filetype names |'filetype'| + -complete=file_in_path file and directory names in 'path' + -complete=filetype filetype names 'filetype' -complete=function function name -complete=help help subjects -complete=highlight highlight groups @@ -1411,13 +1411,13 @@ completion can be enabled: -complete=option options -complete=packadd optional package |pack-add| names -complete=retab |:retab| suboptions - -complete=runtime file and directory names in |'runtimepath'| + -complete=runtime file and directory names in 'runtimepath' -complete=scriptnames sourced script names -complete=shellcmd Shell command -complete=shellcmdline First is a shell command and subsequent ones are filenames. The same behavior as |:!cmd| -complete=sign |:sign| suboptions - -complete=syntax syntax file names |'syntax'| + -complete=syntax syntax file names 'syntax' -complete=syntime |:syntime| suboptions -complete=tag tags -complete=tag_listfiles tags, file names are shown when CTRL-D is hit diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index d6f5aeb354..d763f23bcb 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -540,7 +540,7 @@ attempting a symlink attack (could happen when editing a file in /tmp or when Vim (and Vi) expect tags files to be sorted in ASCII order. Binary searching can then be used, which is a lot faster than a linear search. If your tags -files are not properly sorted, reset the |'tagbsearch'| option. +files are not properly sorted, reset the 'tagbsearch' option. This message is only given when Vim detects a problem when searching for a tag. Sometimes this message is not given, even though the tags file is not properly sorted. diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index c5b59adc3c..2b357e88ad 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1025,7 +1025,7 @@ These commands are not marks themselves, but jump to a mark: *:keepj* *:keepjumps* :keepj[umps] {command} - Moving around in {command} does not change the |''|, + Moving around in {command} does not change the '', |'.| and |'^| marks, the |jumplist| or the |changelist|. Useful when making a change or inserting text diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 76f404ebe2..8d738620f5 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1204,7 +1204,7 @@ A jump table for the options with a short description can be found at |Q_op|. "nofile" and "nowrite" buffers are similar: both: The buffer is not to be written to disk, ":w" doesn't work (":w filename" does work though). - both: The buffer is never considered to be |'modified'|. + both: The buffer is never considered to be 'modified'. There is no warning when the changes will be lost, for example when you quit Vim. both: A swap file is only created when using too much memory @@ -1260,7 +1260,7 @@ A jump table for the options with a short description can be found at |Q_op|. searched for has a relative path, not an absolute part starting with "/", "./" or "../", the 'cdpath' option is not used then. The 'cdpath' option's value has the same form and semantics as - |'path'|. Also see |file-searching|. + 'path'. Also see |file-searching|. The default value is taken from $CDPATH, with a "," prepended to look in the current directory first. If the default value taken from $CDPATH is not what you want, include @@ -1612,7 +1612,7 @@ A jump table for the options with a short description can be found at |Q_op|. controls how completion candidates are reduced from the list of alternatives. If you want to use |fuzzy-matching| to gather more alternatives for your candidate list, - see |'completefuzzycollect'|. + see 'completefuzzycollect'. longest Only insert the longest common text of the matches. If the menu is displayed you can use CTRL-L to add more @@ -1739,7 +1739,7 @@ A jump table for the options with a short description can be found at |Q_op|. local to buffer Copy the structure of the existing lines indent when autoindenting a new line. Normally the new indent is reconstructed by a series of - tabs followed by spaces as required (unless |'expandtab'| is enabled, + tabs followed by spaces as required (unless 'expandtab' is enabled, in which case only spaces are used). Enabling this option makes the new line copy whatever characters were used for indenting on the existing line. 'expandtab' has no effect on these characters, a Tab @@ -1852,7 +1852,7 @@ A jump table for the options with a short description can be found at |Q_op|. *cpo-m* m When included, a showmatch will always wait half a second. When not included, a showmatch will wait half - a second or until a character is typed. |'showmatch'| + a second or until a character is typed. 'showmatch' *cpo-M* M When excluded, "%" matching will take backslashes into account. Thus in "( \( )" and "\( ( \)" the outer @@ -4056,8 +4056,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'lispoptions' 'lop' string (default "") local to buffer Comma-separated list of items that influence the Lisp indenting when - enabled with the |'lisp'| option. Currently only one item is - supported: + enabled with the 'lisp' option. Currently only one item is supported: expr:1 use 'indentexpr' for Lisp indenting when it is set expr:0 do not use 'indentexpr' for Lisp indenting (default) Note that when using 'indentexpr' the `=` operator indents all the @@ -4067,7 +4066,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'lispwords' 'lw' string (default is very long) global or local to buffer |global-local| Comma-separated list of words that influence the Lisp indenting when - enabled with the |'lisp'| option. + enabled with the 'lisp' option. *'list'* *'nolist'* 'list' boolean (default off) @@ -4810,7 +4809,7 @@ A jump table for the options with a short description can be found at |Q_op|. local to buffer When changing the indent of the current line, preserve as much of the indent structure as possible. Normally the indent is replaced by a - series of tabs followed by spaces as required (unless |'expandtab'| is + series of tabs followed by spaces as required (unless 'expandtab' is enabled, in which case only spaces are used). Enabling this option means the indent will preserve as many existing characters as possible for indenting, and only add additional tabs or spaces as required. @@ -5199,7 +5198,7 @@ A jump table for the options with a short description can be found at |Q_op|. current window also scrolls other scrollbind windows (windows that also have this option set). This option is useful for viewing the differences between two versions of a file, see 'diff'. - See |'scrollopt'| for options that determine how this option should be + See 'scrollopt' for options that determine how this option should be interpreted. This option is mostly reset when splitting a window to edit another file. This means that ":split | edit file" results in two windows @@ -5676,7 +5675,7 @@ A jump table for the options with a short description can be found at |Q_op|. 'shiftwidth' 'sw' number (default 8) local to buffer Number of columns that make up one level of (auto)indentation. Used - by |'cindent'|, |<<|, |>>|, etc. + by 'cindent', |<<|, |>>|, etc. If set to 0, Vim uses the current 'tabstop' value. Use |shiftwidth()| to obtain the effective value in scripts. @@ -5853,7 +5852,7 @@ A jump table for the options with a short description can be found at |Q_op|. global or local to window |global-local| The minimal number of screen columns to keep to the left and to the right of the cursor if 'nowrap' is set. Setting this option to a - value greater than 0 while having |'sidescroll'| also at a non-zero + value greater than 0 while having 'sidescroll' also at a non-zero value makes some context visible in the line you are scrolling in horizontally (except at beginning of the line). Setting this option to a large value (like 999) has the effect of keeping the cursor @@ -5864,9 +5863,9 @@ A jump table for the options with a short description can be found at |Q_op|. setlocal sidescrolloff< setlocal sidescrolloff=-1 < - Example: Try this together with 'sidescroll' and 'listchars' as - in the following example to never allow the cursor to move - onto the "extends" character: >vim + Example: Try this together with 'sidescroll' and 'listchars' as in the + following example to never allow the cursor to move onto the + "extends" character: >vim set nowrap sidescroll=1 listchars=extends:>,precedes:< set sidescrolloff=1 @@ -5971,8 +5970,8 @@ A jump table for the options with a short description can be found at |Q_op|. enabled. See also |ins-expandtab| ans user manual section |30.5| for in-depth explanations. - The value of 'softtabstop' will be ignored if |'varsofttabstop'| is set - to anything other than an empty string. + The value of 'softtabstop' will be ignored if 'varsofttabstop' is set to + anything other than an empty string. *'spell'* *'nospell'* 'spell' boolean (default off) @@ -6197,8 +6196,8 @@ A jump table for the options with a short description can be found at |Q_op|. %C fold column for currently drawn line The 'statuscolumn' width follows that of the default columns and - adapts to the |'numberwidth'|, |'signcolumn'| and |'foldcolumn'| option - values (regardless of whether the sign and fold items are present). + adapts to the 'numberwidth', 'signcolumn' and 'foldcolumn' option values + (regardless of whether the sign and fold items are present). Additionally, the 'statuscolumn' grows with the size of the evaluated format string, up to a point (following the maximum size of the default fold, sign and number columns). Shrinking only happens when the number @@ -6211,7 +6210,7 @@ A jump table for the options with a short description can be found at |Q_op|. drawing the wrapped part of a buffer line. When using |v:relnum|, keep in mind that cursor movement by itself will - not cause the 'statuscolumn' to update unless |'relativenumber'| is set. + not cause the 'statuscolumn' to update unless 'relativenumber' is set. NOTE: The %@ click execute function item is supported as well but the specified function will be the same for each row in the same column. @@ -6483,7 +6482,7 @@ A jump table for the options with a short description can be found at |Q_op|. Careful: All text will be in memory: - Don't use this for big files. - Recovery will be impossible! - A swapfile will only be present when |'updatecount'| is non-zero and + A swapfile will only be present when 'updatecount' is non-zero and 'swapfile' is set. When 'swapfile' is reset, the swap file for the current buffer is immediately deleted. When 'swapfile' is set, and 'updatecount' is @@ -6614,7 +6613,7 @@ A jump table for the options with a short description can be found at |Q_op|. character (ASCII 9); a Horizontal Tab always advances to the next tab stop. The value must be at least 1 and at most 9999. - If |'vartabstop'| is set, this option is ignored. + If 'vartabstop' is set, this option is ignored. Leave it at 8 unless you have a strong reason (see usr |30.5|). *'tagbsearch'* *'tbs'* *'notagbsearch'* *'notbs'* @@ -7013,12 +7012,12 @@ A jump table for the options with a short description can be found at |Q_op|. recovery |crash-recovery|). 'updatecount' is set to zero by starting Vim with the "-n" option, see |startup|. When editing in readonly mode this option will be initialized to 10000. - The swapfile can be disabled per buffer with |'swapfile'|. + The swapfile can be disabled per buffer with 'swapfile'. When 'updatecount' is set from zero to non-zero, swap files are created for all buffers that have 'swapfile' set. When 'updatecount' is set to zero, existing swap files are not deleted. - This option has no meaning in buffers where |'buftype'| is "nofile" - or "nowrite". + This option has no meaning in buffers where 'buftype' is "nofile" or + "nowrite". *'updatetime'* *'ut'* 'updatetime' 'ut' number (default 4000) diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 7f20f90424..08b3cb58a5 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -62,7 +62,7 @@ N Repeat the latest "/" or "?" [count] times in * Search forward for the [count]'th occurrence of the word nearest to the cursor. The word used for the search is the first of: - 1. the keyword under the cursor |'iskeyword'| + 1. the keyword under the cursor 'iskeyword' 2. the first keyword after the cursor, in the current line 3. the non-blank word under the cursor diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 066b6715f1..49dfc6eb20 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1072,8 +1072,8 @@ commands can be combined to create a NewGrep command: > {pattern} is a Vim search pattern. Instead of enclosing it in / any non-ID character (see - |'isident'|) can be used, so long as it does not - appear in {pattern}. + 'isident') can be used, so long as it does not appear + in {pattern}. 'ignorecase' applies. To overrule it put |/\c| in the pattern to ignore case or |/\C| to match case. 'smartcase' is not used. diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index d07ff37e57..4007e63c42 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1384,7 +1384,7 @@ Context-sensitive completion on the command-line: ------------------------------------------------------------------------------ *Q_fo* Folding -|'foldmethod'| set foldmethod=manual manual folding +'foldmethod' set foldmethod=manual manual folding set foldmethod=indent folding by indent set foldmethod=expr folding by 'foldexpr' set foldmethod=syntax folding by syntax regions diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index a13bf079e8..22177a34e3 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -207,7 +207,7 @@ CTRL-X s to find suggestions. This works like Insert mode completion. Use CTRL-N to use the next suggestion, CTRL-P to go back. |i_CTRL-X_s| The 'spellsuggest' option influences how the list of suggestions is generated -and sorted. See |'spellsuggest'|. +and sorted. See 'spellsuggest'. The 'spellcapcheck' option is used to check the first word of a sentence starts with a capital. This doesn't work for the first word in the file. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index a3a7a0c3cf..dbc3841f96 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -529,7 +529,7 @@ accordingly, proceeding as follows: However, directories in 'runtimepath' ending in "after" are skipped here and only loaded after packages, see below. Loading plugins won't be done when: - - The |'loadplugins'| option was reset in a vimrc file. + - The 'loadplugins' option was reset in a vimrc file. - The |--noplugin| command line argument is used. - The |--clean| command line argument is used. - The "-u NONE" command line argument is used |-u|. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index bba8f02b25..9d3062a577 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1854,7 +1854,7 @@ the parentheses and backquoted parentheses. Because of the quantity of colorization levels, unlike non-rainbow highlighting, the rainbow mode specifies its highlighting using ctermfg and guifg, thereby bypassing the usual color scheme control using standard highlighting groups. The actual -highlighting used depends on the dark/bright setting (see |'bg'|). +highlighting used depends on the dark/bright setting (see 'bg'). LITE *lite.vim* *ft-lite-syntax* @@ -3421,7 +3421,7 @@ always accept such use of @. *tex-cchar* *tex-cole* *tex-conceal* Tex: Taking Advantage of Conceal Mode~ -If you have |'conceallevel'| set to 2 and if your encoding is utf-8, then a +If you have 'conceallevel' set to 2 and if your encoding is utf-8, then a number of character sequences can be translated into appropriate utf-8 glyphs, including various accented characters, Greek characters in MathZones, and superscripts and subscripts in MathZones. Not all characters can be made into @@ -3429,7 +3429,7 @@ superscripts or subscripts; the constraint is due to what utf-8 supports. In fact, only a few characters are supported as subscripts. One way to use this is to have vertically split windows (see |CTRL-W_v|); one -with |'conceallevel'| at 0 and the other at 2; and both using |'scrollbind'|. +with 'conceallevel' at 0 and the other at 2; and both using 'scrollbind'. *g:tex_conceal* Tex: Selective Conceal Mode~ diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 1d0a267d86..a286a0df89 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -119,7 +119,7 @@ Closing the last window of a tab page closes the tab page too, unless there is only one tab page. Using the mouse: If the tab page line is displayed you can click in the "X" at -the top right to close the current tab page. A custom |'tabline'| may show +the top right to close the current tab page. A custom 'tabline' may show something else. *:tabc* *:tabclose* @@ -182,7 +182,7 @@ SWITCHING TO ANOTHER TAB PAGE: Using the mouse: If the tab page line is displayed you can click in a tab page label to switch to that tab page. Click where there is no label to go to the -next tab page. |'tabline'| +next tab page. 'tabline' :tabn[ext] *:tabn* *:tabnext* *gt* *CTRL-* ** diff --git a/runtime/doc/userfunc.txt b/runtime/doc/userfunc.txt index 2c518eeb3f..65db3f3256 100644 --- a/runtime/doc/userfunc.txt +++ b/runtime/doc/userfunc.txt @@ -345,7 +345,7 @@ This function can then be called with: > < Here GetDict() gets the range but method() does not. *E132* -The recursiveness of user functions is restricted with the |'maxfuncdepth'| +The recursiveness of user functions is restricted with the 'maxfuncdepth' option. It is also possible to use `:eval`. It does not support a range, but does diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 95e1f7489c..fd46caac19 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -29,7 +29,7 @@ CTRL-L Clears and redraws the screen. The redraw may happen screen if "!" is included. To CLEAR the screen use |:mode| or |CTRL-L|. It can be used to redraw the screen in a script - or function (or a mapping if |'lazyredraw'| is set). + or function (or a mapping if 'lazyredraw' is set). See also |nvim__redraw()|. *:redraws* *:redrawstatus* @@ -409,7 +409,7 @@ gx Opens the current filepath or URL (decided by to lines that do NOT match {pattern}. {pattern} is a Vim search pattern. Instead of enclosing - it in / any non-ID character (see |'isident'|) can be + it in / any non-ID character (see 'isident') can be used, so long as it does not appear in {pattern}. Without the enclosing character the pattern cannot include the bar character. 'ignorecase' is not used. diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 6274482396..0dd7df0889 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -93,8 +93,8 @@ Syntax highlighting. |:syntax| this is using a |:colorscheme| command. The highlighted text can be exported as HTML. |convert-to-HTML| Other items that can be highlighted are matches with the search string - |'hlsearch'|, matching parens |matchparen| and the cursor line and - column |'cursorline'| |'cursorcolumn'|. + 'hlsearch', matching parens |matchparen| and the cursor line and + column 'cursorline' 'cursorcolumn'. Spell checking. |spell| When the 'spell' option is set Vim will highlight spelling mistakes. @@ -233,7 +233,7 @@ Insert-mode completion. |ins-completion| |i_CTRL-X_CTRL-R| contents from registers etc. -Long line support. |'wrap'| |'linebreak'| +Long line support. 'wrap' 'linebreak' If the 'wrap' option is off, long lines will not wrap and only part of them will be shown. When the cursor is moved to a part that is not shown, the screen will scroll horizontally. The minimum number of @@ -286,7 +286,7 @@ Finding matches in files. |:vimgrep| advanced Vim regexp pattern, works on all systems and also works to search in compressed files. -Improved indenting for programs. |'cindent'| +Improved indenting for programs. 'cindent' When the 'cindent' option is on the indent of each line is automatically adjusted. C syntax is mostly recognized. The indent for various styles can be set with 'cinoptions'. The keys to trigger @@ -355,7 +355,7 @@ Editing binary files. |edit-binary| executable file, without corrupting it. Vim doesn't remove NUL characters (they are represented as internally). |-b| command-line argument to start editing a binary file - |'binary'| Option set by |-b|. Prevents adding an for the + 'binary' Option set by |-b|. Prevents adding an for the last line in the file. Multi-language support. |multi-lang| diff --git a/runtime/doc/vietnamese.txt b/runtime/doc/vietnamese.txt index 6c896c09bd..9b76c70e1c 100644 --- a/runtime/doc/vietnamese.txt +++ b/runtime/doc/vietnamese.txt @@ -22,11 +22,11 @@ or use one of the Vietnamese keymaps included in the Vim distribution, like below > :set keymap=vietnamese-telex_utf-8 < -See |'keymap'| for more information. +See 'keymap' for more information. In the latter case, you can type Vietnamese even if you do not have a Vietnamese input method engine (IME) or you want Vim to be independent from a -system-wide keyboard settings (when |'imdisable'| is set). You can also |:map| +system-wide keyboard settings (when 'imdisable' is set). You can also |:map| a key to switch between keyboards. Vim comes with the following Vietnamese keymaps: diff --git a/runtime/doc/vimfn.txt b/runtime/doc/vimfn.txt index 754d1a7e94..2e3f582171 100644 --- a/runtime/doc/vimfn.txt +++ b/runtime/doc/vimfn.txt @@ -3449,13 +3449,13 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* customlist,{func} custom completion, defined via {func} diff_buffer |:diffget| and |:diffput| completion dir directory names - dir_in_path directory names in |'cdpath'| + dir_in_path directory names in 'cdpath' environment environment variable names event autocommand events expression Vim expression file file and directory names - file_in_path file and directory names in |'path'| - filetype filetype names |'filetype'| + file_in_path file and directory names in 'path' + filetype filetype names 'filetype' filetypecmd |:filetype| suboptions function function name help help subjects @@ -3475,7 +3475,7 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()* shellcmd Shell command shellcmdline Shell command line with filename arguments sign |:sign| suboptions - syntax syntax file names |'syntax'| + syntax syntax file names 'syntax' syntime |:syntime| suboptions tag tags tag_listfiles tags, file names @@ -10766,7 +10766,7 @@ strridx({haystack}, {needle} [, {start}]) *strridx()* strtrans({string}) *strtrans()* The result is a String, which is {string} with all unprintable - characters translated into printable characters |'isprint'|. + characters translated into printable characters 'isprint'. Like they are shown in a window. Example: >vim echo strtrans(@a) < This displays a newline in register a as "^@" instead of @@ -11308,7 +11308,7 @@ taglist({expr} [, {filename}]) *taglist()* Refer to |tag-regexp| for more information about the tag search regular expression pattern. - Refer to |'tags'| for information about how the tags file is + Refer to 'tags' for information about how the tags file is located by Vim. Refer to |tags-file-format| for the format of the tags file generated by the different ctags tools. @@ -11762,7 +11762,7 @@ virtcol({expr} [, {list} [, {winid}]]) *virtcol()* last character. When "off" is omitted zero is used. When Virtual editing is active in the current mode, a position beyond the end of the line can be returned. Also see - |'virtualedit'| + 'virtualedit' If {list} is present and non-zero then virtcol() returns a List with the first and last screen position occupied by the diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index c7116757de..daea333483 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -648,7 +648,7 @@ vim.bo.bl = vim.bo.buflisted --- "nofile" and "nowrite" buffers are similar: --- both: The buffer is not to be written to disk, ":w" doesn't --- work (":w filename" does work though). ---- both: The buffer is never considered to be `'modified'`. +--- both: The buffer is never considered to be 'modified'. --- There is no warning when the changes will be lost, for --- example when you quit Vim. --- both: A swap file is only created when using too much memory @@ -714,7 +714,7 @@ vim.go.cdh = vim.go.cdhome --- searched for has a relative path, not an absolute part starting with --- "/", "./" or "../", the 'cdpath' option is not used then. --- The 'cdpath' option's value has the same form and semantics as ---- `'path'`. Also see `file-searching`. +--- 'path'. Also see `file-searching`. --- The default value is taken from $CDPATH, with a "," prepended to look --- in the current directory first. --- If the default value taken from $CDPATH is not what you want, include @@ -1149,7 +1149,7 @@ vim.go.cia = vim.go.completeitemalign --- controls how completion candidates are reduced from the --- list of alternatives. If you want to use `fuzzy-matching` --- to gather more alternatives for your candidate list, ---- see `'completefuzzycollect'`. +--- see 'completefuzzycollect'. --- --- longest Only insert the longest common text of the matches. If --- the menu is displayed you can use CTRL-L to add more @@ -1293,7 +1293,7 @@ vim.go.cf = vim.go.confirm --- Copy the structure of the existing lines indent when autoindenting a --- new line. Normally the new indent is reconstructed by a series of ---- tabs followed by spaces as required (unless `'expandtab'` is enabled, +--- tabs followed by spaces as required (unless 'expandtab' is enabled, --- in which case only spaces are used). Enabling this option makes the --- new line copy whatever characters were used for indenting on the --- existing line. 'expandtab' has no effect on these characters, a Tab @@ -1409,7 +1409,7 @@ vim.bo.ci = vim.bo.copyindent --- *cpo-m* --- m When included, a showmatch will always wait half a --- second. When not included, a showmatch will wait half ---- a second or until a character is typed. `'showmatch'` +--- a second or until a character is typed. 'showmatch' --- *cpo-M* --- M When excluded, "%" matching will take backslashes into --- account. Thus in "( \( )" and "\( ( \)" the outer @@ -4045,8 +4045,7 @@ vim.o.lisp = false vim.bo.lisp = vim.o.lisp --- Comma-separated list of items that influence the Lisp indenting when ---- enabled with the `'lisp'` option. Currently only one item is ---- supported: +--- enabled with the 'lisp' option. Currently only one item is supported: --- expr:1 use 'indentexpr' for Lisp indenting when it is set --- expr:0 do not use 'indentexpr' for Lisp indenting (default) --- Note that when using 'indentexpr' the `=` operator indents all the @@ -4059,7 +4058,7 @@ vim.bo.lispoptions = vim.o.lispoptions vim.bo.lop = vim.bo.lispoptions --- Comma-separated list of words that influence the Lisp indenting when ---- enabled with the `'lisp'` option. +--- enabled with the 'lisp' option. --- --- @type string vim.o.lispwords = "defun,define,defmacro,set!,lambda,if,case,let,flet,let*,letrec,do,do*,define-syntax,let-syntax,letrec-syntax,destructuring-bind,defpackage,defparameter,defstruct,deftype,defvar,do-all-symbols,do-external-symbols,do-symbols,dolist,dotimes,ecase,etypecase,eval-when,labels,macrolet,multiple-value-bind,multiple-value-call,multiple-value-prog1,multiple-value-setq,prog1,progv,typecase,unless,unwind-protect,when,with-input-from-string,with-open-file,with-open-stream,with-output-to-string,with-package-iterator,define-condition,handler-bind,handler-case,restart-bind,restart-case,with-simple-restart,store-value,use-value,muffle-warning,abort,continue,with-slots,with-slots*,with-accessors,with-accessors*,defclass,defmethod,print-unreadable-object" @@ -5002,7 +5001,7 @@ vim.go.pa = vim.go.path --- When changing the indent of the current line, preserve as much of the --- indent structure as possible. Normally the indent is replaced by a ---- series of tabs followed by spaces as required (unless `'expandtab'` is +--- series of tabs followed by spaces as required (unless 'expandtab' is --- enabled, in which case only spaces are used). Enabling this option --- means the indent will preserve as many existing characters as possible --- for indenting, and only add additional tabs or spaces as required. @@ -5454,7 +5453,7 @@ vim.bo.scbk = vim.bo.scrollback --- current window also scrolls other scrollbind windows (windows that --- also have this option set). This option is useful for viewing the --- differences between two versions of a file, see 'diff'. ---- See `'scrollopt'` for options that determine how this option should be +--- See 'scrollopt' for options that determine how this option should be --- interpreted. --- This option is mostly reset when splitting a window to edit another --- file. This means that ":split | edit file" results in two windows @@ -6007,7 +6006,7 @@ vim.go.shiftround = vim.o.shiftround vim.go.sr = vim.go.shiftround --- Number of columns that make up one level of (auto)indentation. Used ---- by `'cindent'`, `<<`, `>>`, etc. +--- by 'cindent', `<<`, `>>`, etc. --- If set to 0, Vim uses the current 'tabstop' value. Use `shiftwidth()` --- to obtain the effective value in scripts. --- @@ -6222,7 +6221,7 @@ vim.go.ss = vim.go.sidescroll --- The minimal number of screen columns to keep to the left and to the --- right of the cursor if 'nowrap' is set. Setting this option to a ---- value greater than 0 while having `'sidescroll'` also at a non-zero +--- value greater than 0 while having 'sidescroll' also at a non-zero --- value makes some context visible in the line you are scrolling in --- horizontally (except at beginning of the line). Setting this option --- to a large value (like 999) has the effect of keeping the cursor @@ -6236,9 +6235,9 @@ vim.go.ss = vim.go.sidescroll --- setlocal sidescrolloff=-1 --- ``` --- ---- Example: Try this together with 'sidescroll' and 'listchars' as ---- in the following example to never allow the cursor to move ---- onto the "extends" character: +--- Example: Try this together with 'sidescroll' and 'listchars' as in the +--- following example to never allow the cursor to move onto the +--- "extends" character: --- --- ```vim --- @@ -6366,8 +6365,8 @@ vim.wo.sms = vim.wo.smoothscroll --- enabled. See also `ins-expandtab` ans user manual section `30.5` for --- in-depth explanations. --- ---- The value of 'softtabstop' will be ignored if `'varsofttabstop'` is set ---- to anything other than an empty string. +--- The value of 'softtabstop' will be ignored if 'varsofttabstop' is set to +--- anything other than an empty string. --- --- @type integer vim.o.softtabstop = 0 @@ -6629,8 +6628,8 @@ vim.go.sol = vim.go.startofline --- %C fold column for currently drawn line --- --- The 'statuscolumn' width follows that of the default columns and ---- adapts to the `'numberwidth'`, `'signcolumn'` and `'foldcolumn'` option ---- values (regardless of whether the sign and fold items are present). +--- adapts to the 'numberwidth', 'signcolumn' and 'foldcolumn' option values +--- (regardless of whether the sign and fold items are present). --- Additionally, the 'statuscolumn' grows with the size of the evaluated --- format string, up to a point (following the maximum size of the default --- fold, sign and number columns). Shrinking only happens when the number @@ -6643,7 +6642,7 @@ vim.go.sol = vim.go.startofline --- drawing the wrapped part of a buffer line. --- --- When using `v:relnum`, keep in mind that cursor movement by itself will ---- not cause the 'statuscolumn' to update unless `'relativenumber'` is set. +--- not cause the 'statuscolumn' to update unless 'relativenumber' is set. --- --- NOTE: The %@ click execute function item is supported as well but the --- specified function will be the same for each row in the same column. @@ -6964,7 +6963,7 @@ vim.bo.sua = vim.bo.suffixesadd --- Careful: All text will be in memory: --- - Don't use this for big files. --- - Recovery will be impossible! ---- A swapfile will only be present when `'updatecount'` is non-zero and +--- A swapfile will only be present when 'updatecount' is non-zero and --- 'swapfile' is set. --- When 'swapfile' is reset, the swap file for the current buffer is --- immediately deleted. When 'swapfile' is set, and 'updatecount' is @@ -7124,7 +7123,7 @@ vim.go.tpm = vim.go.tabpagemax --- character (ASCII 9); a Horizontal Tab always advances to the next tab --- stop. --- The value must be at least 1 and at most 9999. ---- If `'vartabstop'` is set, this option is ignored. +--- If 'vartabstop' is set, this option is ignored. --- Leave it at 8 unless you have a strong reason (see usr `30.5`). --- --- @type integer @@ -7622,12 +7621,12 @@ vim.go.ur = vim.go.undoreload --- recovery `crash-recovery`). 'updatecount' is set to zero by starting --- Vim with the "-n" option, see `startup`. When editing in readonly --- mode this option will be initialized to 10000. ---- The swapfile can be disabled per buffer with `'swapfile'`. +--- The swapfile can be disabled per buffer with 'swapfile'. --- When 'updatecount' is set from zero to non-zero, swap files are --- created for all buffers that have 'swapfile' set. When 'updatecount' --- is set to zero, existing swap files are not deleted. ---- This option has no meaning in buffers where `'buftype'` is "nofile" ---- or "nowrite". +--- This option has no meaning in buffers where 'buftype' is "nofile" or +--- "nowrite". --- --- @type integer vim.o.updatecount = 200 diff --git a/runtime/lua/vim/_meta/vimfn.lua b/runtime/lua/vim/_meta/vimfn.lua index 0c6d806a36..a5d7c5c4ea 100644 --- a/runtime/lua/vim/_meta/vimfn.lua +++ b/runtime/lua/vim/_meta/vimfn.lua @@ -3093,13 +3093,13 @@ function vim.fn.getcmdwintype() end --- customlist,{func} custom completion, defined via {func} --- diff_buffer |:diffget| and |:diffput| completion --- dir directory names ---- dir_in_path directory names in |'cdpath'| +--- dir_in_path directory names in 'cdpath' --- environment environment variable names --- event autocommand events --- expression Vim expression --- file file and directory names ---- file_in_path file and directory names in |'path'| ---- filetype filetype names |'filetype'| +--- file_in_path file and directory names in 'path' +--- filetype filetype names 'filetype' --- filetypecmd |:filetype| suboptions --- function function name --- help help subjects @@ -3119,7 +3119,7 @@ function vim.fn.getcmdwintype() end --- shellcmd Shell command --- shellcmdline Shell command line with filename arguments --- sign |:sign| suboptions ---- syntax syntax file names |'syntax'| +--- syntax syntax file names 'syntax' --- syntime |:syntime| suboptions --- tag tags --- tag_listfiles tags, file names @@ -9816,7 +9816,7 @@ function vim.fn.strptime(format, timestring) end function vim.fn.strridx(haystack, needle, start) end --- The result is a String, which is {string} with all unprintable ---- characters translated into printable characters |'isprint'|. +--- characters translated into printable characters 'isprint'. --- Like they are shown in a window. Example: >vim --- echo strtrans(\@a) --- vim echo strtrans(@a) >|, etc. + by 'cindent', |<<|, |>>|, etc. If set to 0, Vim uses the current 'tabstop' value. Use |shiftwidth()| to obtain the effective value in scripts. ]=], @@ -8158,7 +8157,7 @@ local options = { desc = [=[ The minimal number of screen columns to keep to the left and to the right of the cursor if 'nowrap' is set. Setting this option to a - value greater than 0 while having |'sidescroll'| also at a non-zero + value greater than 0 while having 'sidescroll' also at a non-zero value makes some context visible in the line you are scrolling in horizontally (except at beginning of the line). Setting this option to a large value (like 999) has the effect of keeping the cursor @@ -8169,9 +8168,9 @@ local options = { setlocal sidescrolloff< setlocal sidescrolloff=-1 < - Example: Try this together with 'sidescroll' and 'listchars' as - in the following example to never allow the cursor to move - onto the "extends" character: >vim + Example: Try this together with 'sidescroll' and 'listchars' as in the + following example to never allow the cursor to move onto the + "extends" character: >vim set nowrap sidescroll=1 listchars=extends:>,precedes:< set sidescrolloff=1 @@ -8344,8 +8343,8 @@ local options = { enabled. See also |ins-expandtab| ans user manual section |30.5| for in-depth explanations. - The value of 'softtabstop' will be ignored if |'varsofttabstop'| is set - to anything other than an empty string. + The value of 'softtabstop' will be ignored if 'varsofttabstop' is set to + anything other than an empty string. ]=], full_name = 'softtabstop', scope = { 'buf' }, @@ -8675,8 +8674,8 @@ local options = { %C fold column for currently drawn line The 'statuscolumn' width follows that of the default columns and - adapts to the |'numberwidth'|, |'signcolumn'| and |'foldcolumn'| option - values (regardless of whether the sign and fold items are present). + adapts to the 'numberwidth', 'signcolumn' and 'foldcolumn' option values + (regardless of whether the sign and fold items are present). Additionally, the 'statuscolumn' grows with the size of the evaluated format string, up to a point (following the maximum size of the default fold, sign and number columns). Shrinking only happens when the number @@ -8689,7 +8688,7 @@ local options = { drawing the wrapped part of a buffer line. When using |v:relnum|, keep in mind that cursor movement by itself will - not cause the 'statuscolumn' to update unless |'relativenumber'| is set. + not cause the 'statuscolumn' to update unless 'relativenumber' is set. NOTE: The %@ click execute function item is supported as well but the specified function will be the same for each row in the same column. @@ -9011,7 +9010,7 @@ local options = { Careful: All text will be in memory: - Don't use this for big files. - Recovery will be impossible! - A swapfile will only be present when |'updatecount'| is non-zero and + A swapfile will only be present when 'updatecount' is non-zero and 'swapfile' is set. When 'swapfile' is reset, the swap file for the current buffer is immediately deleted. When 'swapfile' is set, and 'updatecount' is @@ -9210,7 +9209,7 @@ local options = { character (ASCII 9); a Horizontal Tab always advances to the next tab stop. The value must be at least 1 and at most 9999. - If |'vartabstop'| is set, this option is ignored. + If 'vartabstop' is set, this option is ignored. Leave it at 8 unless you have a strong reason (see usr |30.5|). ]=], full_name = 'tabstop', @@ -9869,12 +9868,12 @@ local options = { recovery |crash-recovery|). 'updatecount' is set to zero by starting Vim with the "-n" option, see |startup|. When editing in readonly mode this option will be initialized to 10000. - The swapfile can be disabled per buffer with |'swapfile'|. + The swapfile can be disabled per buffer with 'swapfile'. When 'updatecount' is set from zero to non-zero, swap files are created for all buffers that have 'swapfile' set. When 'updatecount' is set to zero, existing swap files are not deleted. - This option has no meaning in buffers where |'buftype'| is "nofile" - or "nowrite". + This option has no meaning in buffers where 'buftype' is "nofile" or + "nowrite". ]=], full_name = 'updatecount', scope = { 'global' }, From 5b3606b2c44aef80136afe57f2676d7725f37d9a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 6 Aug 2025 20:03:22 +0800 Subject: [PATCH 2/2] vim-patch:067adc1: runtime(doc): add back bars for the '' mark this was erroneously changed in commit 85cd509885a05c3a6bb029fb378b1295f107f8f6 related: vim/vim#17857 https://github.com/vim/vim/commit/067adc1ff229155574ce57fdce7ebaa0af28ed23 --- runtime/doc/index.txt | 2 +- runtime/doc/motion.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 7afa0a2ecb..3cc81eb08c 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -248,7 +248,7 @@ tag char note action in Normal mode ~ |&| & 2 repeat last :s |'| '{a-zA-Z0-9} 1 cursor to the first CHAR on the line with mark {a-zA-Z0-9} -'' '' 1 cursor to the first CHAR of the line where +|''| '' 1 cursor to the first CHAR of the line where the cursor was before the latest jump. |'(| '( 1 cursor to the first CHAR on the line of the start of the current sentence diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 2b357e88ad..c5b59adc3c 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1025,7 +1025,7 @@ These commands are not marks themselves, but jump to a mark: *:keepj* *:keepjumps* :keepj[umps] {command} - Moving around in {command} does not change the '', + Moving around in {command} does not change the |''|, |'.| and |'^| marks, the |jumplist| or the |changelist|. Useful when making a change or inserting text