Skip to content

Commit 668ae29

Browse files
zeertzjqh-east
authored andcommitted
vim-patch:partial:450d591: runtime(doc): tweak documentation style (neovim#35748)
closes: vim/vim#18284 vim/vim@450d591 Skip ft_hare.txt. Co-authored-by: Hirohito Higashi <[email protected]>
1 parent e094e6c commit 668ae29

File tree

3 files changed

+189
-189
lines changed

3 files changed

+189
-189
lines changed

runtime/doc/options.txt

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,8 @@ A jump table for the options with a short description can be found at |Q_op|.
859859
eol allow backspacing over line breaks (join lines)
860860
start allow backspacing over the start of insert; CTRL-W and CTRL-U
861861
stop once at the start of insert.
862-
nostop like start, except CTRL-W and CTRL-U do not stop at the start of
863-
insert.
862+
nostop like start, except CTRL-W and CTRL-U do not stop at the start
863+
of insert.
864864

865865
When the value is empty, Vi compatible backspacing is used, none of
866866
the ways mentioned for the items above are possible.
@@ -1546,19 +1546,19 @@ A jump table for the options with a short description can be found at |Q_op|.
15461546
name of a function or a |Funcref|. For |Funcref| values,
15471547
spaces must be escaped with a backslash ('\'), and commas with
15481548
double backslashes ('\\') (see |option-backslash|).
1549-
Unlike other sources, functions can provide completions starting
1550-
from a non-keyword character before the cursor, and their
1551-
start position for replacing text may differ from other sources.
1552-
If the Dict returned by the {func} includes {"refresh": "always"},
1553-
the function will be invoked again whenever the leading text
1554-
changes.
1549+
Unlike other sources, functions can provide completions
1550+
starting from a non-keyword character before the cursor, and
1551+
their start position for replacing text may differ from other
1552+
sources. If the Dict returned by the {func} includes
1553+
`{"refresh": "always"}`, the function will be invoked again
1554+
whenever the leading text changes.
15551555
If generating matches is potentially slow, call
1556-
|complete_check()| periodically to keep Vim responsive. This
1556+
|complete_check()| periodically to keep Vim responsive. This
15571557
is especially important for |ins-autocompletion|.
1558-
F equivalent to using "F{func}", where the function is taken from
1559-
the 'completefunc' option.
1560-
o equivalent to using "F{func}", where the function is taken from
1561-
the 'omnifunc' option.
1558+
F equivalent to using "F{func}", where the function is taken
1559+
from the 'completefunc' option.
1560+
o equivalent to using "F{func}", where the function is taken
1561+
from the 'omnifunc' option.
15621562

15631563
Unloaded buffers are not loaded, thus their autocmds |:autocmd| are
15641564
not executed, this may lead to unexpected completions from some files
@@ -1573,8 +1573,8 @@ A jump table for the options with a short description can be found at |Q_op|.
15731573

15741574
An optional match limit can be specified for a completion source by
15751575
appending a caret ("^") followed by a {count} to the source flag.
1576-
For example: ".^9,w,u,t^5" limits matches from the current buffer
1577-
to 9 and from tags to 5. Other sources remain unlimited.
1576+
For example: ".^9,w,u,t^5" limits matches from the current buffer to 9
1577+
and from tags to 5. Other sources remain unlimited.
15781578
Note: The match limit takes effect only during forward completion
15791579
(CTRL-N) and is ignored during backward completion (CTRL-P).
15801580

@@ -1628,7 +1628,7 @@ A jump table for the options with a short description can be found at |Q_op|.
16281628
A comma-separated list of options for Insert mode completion
16291629
|ins-completion|. The supported values are:
16301630

1631-
fuzzy Enable |fuzzy-matching| for completion candidates. This
1631+
fuzzy Enable |fuzzy-matching| for completion candidates. This
16321632
allows for more flexible and intuitive matching, where
16331633
characters can be skipped and matches can be found even
16341634
if the exact sequence is not typed. Note: This option
@@ -1701,9 +1701,9 @@ A jump table for the options with a short description can be found at |Q_op|.
17011701
only modifiable in MS-Windows
17021702
When this option is set it overrules 'shellslash' for completion:
17031703
- When this option is set to "slash", a forward slash is used for path
1704-
completion in insert mode. This is useful when editing HTML tag, or
1704+
completion in insert mode. This is useful when editing HTML tag, or
17051705
Makefile with 'noshellslash' on MS-Windows.
1706-
- When this option is set to "backslash", backslash is used. This is
1706+
- When this option is set to "backslash", backslash is used. This is
17071707
useful when editing a batch file with 'shellslash' set on MS-Windows.
17081708
- When this option is empty, same character is used as for
17091709
'shellslash'.
@@ -2006,7 +2006,7 @@ A jump table for the options with a short description can be found at |Q_op|.
20062006
*cpo-;*
20072007
; When using |,| or |;| to repeat the last |t| search
20082008
and the cursor is right in front of the searched
2009-
character, the cursor won't move. When not included,
2009+
character, the cursor won't move. When not included,
20102010
the cursor would skip over it and jump to the
20112011
following occurrence.
20122012
*cpo-~*
@@ -2129,7 +2129,7 @@ A jump table for the options with a short description can be found at |Q_op|.
21292129

21302130
When this option is empty or an entry "spell" is present, and spell
21312131
checking is enabled, words in the word lists for the currently active
2132-
'spelllang' are used. See |spell|.
2132+
'spelllang' are used. See |spell|.
21332133

21342134
To include a comma in a file name precede it with a backslash. Spaces
21352135
after a comma are ignored, otherwise spaces are included in the file
@@ -2188,7 +2188,7 @@ A jump table for the options with a short description can be found at |Q_op|.
21882188
All are optional. Items must be separated by a comma.
21892189

21902190
algorithm:{text} Use the specified diff algorithm with the
2191-
internal diff engine. Currently supported
2191+
internal diff engine. Currently supported
21922192
algorithms are:
21932193
myers the default algorithm
21942194
minimal spend extra time to generate the
@@ -2211,7 +2211,7 @@ A jump table for the options with a short description can be found at |Q_op|.
22112211
When omitted a context of six lines is used.
22122212
When using zero the context is actually one,
22132213
since folds require a line in between, also
2214-
for a deleted line. Set it to a very large
2214+
for a deleted line. Set it to a very large
22152215
value (999999) to disable folding completely.
22162216
See |fold-diff|.
22172217

@@ -2294,14 +2294,14 @@ A jump table for the options with a short description can be found at |Q_op|.
22942294
exactly.
22952295

22962296
linematch:{n} Align and mark changes between the most
2297-
similar lines between the buffers. When the
2297+
similar lines between the buffers. When the
22982298
total number of lines in the diff hunk exceeds
22992299
{n}, the lines will not be aligned because for
23002300
very large diff hunks there will be a
2301-
noticeable lag. A reasonable setting is
2301+
noticeable lag. A reasonable setting is
23022302
"linematch:60", as this will enable alignment
2303-
for a 2 buffer diff hunk of 30 lines each,
2304-
or a 3 buffer diff hunk of 20 lines each.
2303+
for a 2 buffer diff hunk of 30 lines each, or
2304+
a 3 buffer diff hunk of 20 lines each.
23052305
Implicitly sets "filler" when this is set.
23062306

23072307
vertical Start diff mode with vertical splits (unless
@@ -2345,7 +2345,7 @@ A jump table for the options with a short description can be found at |Q_op|.
23452345
file name uniqueness in the preserve directory.
23462346
On Win32, it is also possible to end with "\\". However, When a
23472347
separating comma is following, you must use "//", since "\\" will
2348-
include the comma in the file name. Therefore it is recommended to
2348+
include the comma in the file name. Therefore it is recommended to
23492349
use '//', instead of '\\'.
23502350
- Spaces after the comma are ignored, other spaces are considered part
23512351
of the directory name. To have a space at the start of a directory
@@ -2477,7 +2477,7 @@ A jump table for the options with a short description can be found at |Q_op|.
24772477
makes a difference for error messages, the bell will be used always
24782478
for a lot of errors without a message (e.g., hitting <Esc> in Normal
24792479
mode). See 'visualbell' to make the bell behave like a screen flash
2480-
or do nothing. See 'belloff' to finetune when to ring the bell.
2480+
or do nothing. See 'belloff' to finetune when to ring the bell.
24812481

24822482
*'errorfile'* *'ef'*
24832483
'errorfile' 'ef' string (default "errors.err")
@@ -3229,7 +3229,7 @@ A jump table for the options with a short description can be found at |Q_op|.
32293229
:s///gg subst. all subst. one
32303230

32313231
NOTE: Setting this option may break plugins that rely on the default
3232-
behavior of the 'g' flag. This will also make the 'g' flag have the
3232+
behavior of the 'g' flag. This will also make the 'g' flag have the
32333233
opposite effect of that documented in |:s_g|.
32343234

32353235
*'grepformat'* *'gfm'*
@@ -3662,7 +3662,7 @@ A jump table for the options with a short description can be found at |Q_op|.
36623662
avoid that Vim hangs while you are typing the pattern.
36633663
The |hl-IncSearch| highlight group determines the highlighting.
36643664
When 'hlsearch' is on, all matched strings are highlighted too while
3665-
typing a search command. See also: 'hlsearch'.
3665+
typing a search command. See also: 'hlsearch'.
36663666
If you don't want to turn 'hlsearch' on, but want to highlight all
36673667
matches while searching, you can turn on and off 'hlsearch' with
36683668
autocmd. Example: >vim
@@ -4046,8 +4046,8 @@ A jump table for the options with a short description can be found at |Q_op|.
40464046
than at the last character that fits on the screen. Unlike
40474047
'wrapmargin' and 'textwidth', this does not insert <EOL>s in the file,
40484048
it only affects the way the file is displayed, not its contents.
4049-
If 'breakindent' is set, line is visually indented. Then, the value
4050-
of 'showbreak' is used to put in front of wrapped lines. This option
4049+
If 'breakindent' is set, line is visually indented. Then, the value
4050+
of 'showbreak' is used to put in front of wrapped lines. This option
40514051
is not used when the 'wrap' option is off.
40524052
Note that <Tab> characters after an <EOL> are mostly not displayed
40534053
with the right amount of white space.
@@ -4609,8 +4609,8 @@ A jump table for the options with a short description can be found at |Q_op|.
46094609
'mousemoveevent' 'mousemev' boolean (default off)
46104610
global
46114611
When on, mouse move events are delivered to the input queue and are
4612-
available for mapping |<MouseMove>|. The default, off, avoids the mouse
4613-
movement overhead except when needed.
4612+
available for mapping |<MouseMove>|. The default, off, avoids the
4613+
mouse movement overhead except when needed.
46144614
Warning: Setting this option can make pending mappings to be aborted
46154615
when the mouse is moved.
46164616

@@ -4658,7 +4658,7 @@ A jump table for the options with a short description can be found at |Q_op|.
46584658
bin If included, numbers starting with "0b" or "0B" will be
46594659
considered to be binary. Example: Using CTRL-X on
46604660
"0b1000" subtracts one, resulting in "0b0111".
4661-
unsigned If included, numbers are recognized as unsigned. Thus a
4661+
unsigned If included, numbers are recognized as unsigned. Thus a
46624662
leading dash or negative sign won't be considered as part of
46634663
the number. Examples:
46644664
Using CTRL-X on "2020" in "9-2020" results in "9-2019"
@@ -4715,14 +4715,14 @@ A jump table for the options with a short description can be found at |Q_op|.
47154715
local to window
47164716
Minimal number of columns to use for the line number. Only relevant
47174717
when the 'number' or 'relativenumber' option is set or printing lines
4718-
with a line number. Since one space is always between the number and
4718+
with a line number. Since one space is always between the number and
47194719
the text, there is one less character for the number itself.
47204720
The value is the minimum width. A bigger width is used when needed to
47214721
fit the highest line number in the buffer respectively the number of
47224722
rows in the window, depending on whether 'number' or 'relativenumber'
4723-
is set. Thus with the Vim default of 4 there is room for a line number
4724-
up to 999. When the buffer has 1000 lines five columns will be used.
4725-
The minimum value is 1, the maximum value is 20.
4723+
is set. Thus with the Vim default of 4 there is room for a line
4724+
number up to 999. When the buffer has 1000 lines five columns will be
4725+
used. The minimum value is 1, the maximum value is 20.
47264726

47274727
*'omnifunc'* *'ofu'*
47284728
'omnifunc' 'ofu' string (default "")
@@ -5023,12 +5023,12 @@ A jump table for the options with a short description can be found at |Q_op|.
50235023
'relativenumber' 'rnu' boolean (default off)
50245024
local to window
50255025
Show the line number relative to the line with the cursor in front of
5026-
each line. Relative line numbers help you use the |count| you can
5026+
each line. Relative line numbers help you use the |count| you can
50275027
precede some vertical motion commands (e.g. j k + -) with, without
5028-
having to calculate it yourself. Especially useful in combination with
5029-
other commands (e.g. y d c < > gq gw =).
5030-
When the 'n' option is excluded from 'cpoptions' a wrapped
5031-
line will not use the column of line numbers.
5028+
having to calculate it yourself. Especially useful in combination
5029+
with other commands (e.g. y d c < > gq gw =).
5030+
When the 'n' option is excluded from 'cpoptions' a wrapped line will
5031+
not use the column of line numbers.
50325032
The 'numberwidth' option can be used to set the room used for the line
50335033
number.
50345034
When a long, wrapped line doesn't start with the first character, '-'
@@ -5693,7 +5693,7 @@ A jump table for the options with a short description can be found at |Q_op|.
56935693
the "!" and ":!" commands. Includes the redirection. See
56945694
'shellquote' to exclude the redirection. It's probably not useful
56955695
to set both options.
5696-
When the value is '(' then ')' is appended. When the value is '"('
5696+
When the value is '(' then ')' is appended. When the value is '"('
56975697
then ')"' is appended.
56985698
When the value is '(' then also see 'shellxescape'.
56995699
This option cannot be set from a |modeline| or in the |sandbox|, for
@@ -5909,21 +5909,21 @@ A jump table for the options with a short description can be found at |Q_op|.
59095909
*'signcolumn'* *'scl'*
59105910
'signcolumn' 'scl' string (default "auto")
59115911
local to window
5912-
When and how to draw the signcolumn. Valid values are:
5912+
When and how to draw the signcolumn. Valid values are:
59135913
"auto" only when there is a sign to display
59145914
"auto:[1-9]" resize to accommodate multiple signs up to the
5915-
given number (maximum 9), e.g. "auto:4"
5915+
given number (maximum 9), e.g. "auto:4"
59165916
"auto:[1-8]-[2-9]"
5917-
resize to accommodate multiple signs up to the
5917+
resize to accommodate multiple signs up to the
59185918
given maximum number (maximum 9) while keeping
59195919
at least the given minimum (maximum 8) fixed
59205920
space. The minimum number should always be less
59215921
than the maximum number, e.g. "auto:2-5"
59225922
"no" never
59235923
"yes" always
59245924
"yes:[1-9]" always, with fixed space for signs up to the given
5925-
number (maximum 9), e.g. "yes:3"
5926-
"number" display signs in the 'number' column. If the number
5925+
number (maximum 9), e.g. "yes:3"
5926+
"number" display signs in the 'number' column. If the number
59275927
column is not present, then behaves like "auto".
59285928

59295929
*'smartcase'* *'scs'* *'nosmartcase'* *'noscs'*
@@ -5977,7 +5977,7 @@ A jump table for the options with a short description can be found at |Q_op|.
59775977
local to window
59785978
Scrolling works with screen lines. When 'wrap' is set and the first
59795979
line in the window wraps part of it may not be visible, as if it is
5980-
above the window. "<<<" is displayed at the start of the first line,
5980+
above the window. "<<<" is displayed at the start of the first line,
59815981
highlighted with |hl-NonText|.
59825982
You may also want to add "lastline" to the 'display' option to show as
59835983
much of the last line as possible.
@@ -6067,7 +6067,7 @@ A jump table for the options with a short description can be found at |Q_op|.
60676067
the two-letter, lower case region name. You can use more than one
60686068
region by listing them: "en_us,en_ca" supports both US and Canadian
60696069
English, but not words specific for Australia, New Zealand or Great
6070-
Britain. (Note: currently en_au and en_nz dictionaries are older than
6070+
Britain. (Note: currently en_au and en_nz dictionaries are older than
60716071
en_ca, en_gb and en_us).
60726072
If the name "cjk" is included East Asian characters are excluded from
60736073
spell checking. This is useful when editing text that also has Asian
@@ -6191,9 +6191,9 @@ A jump table for the options with a short description can be found at |Q_op|.
61916191
topline Keep the topline the same.
61926192

61936193
For the "screen" and "topline" values, the cursor position will be
6194-
changed when necessary. In this case, the jumplist will be populated
6195-
with the previous cursor position. For "screen", the text cannot always
6196-
be kept on the same screen line when 'wrap' is enabled.
6194+
changed when necessary. In this case, the jumplist will be populated
6195+
with the previous cursor position. For "screen", the text cannot
6196+
always be kept on the same screen line when 'wrap' is enabled.
61976197

61986198
*'splitright'* *'spr'* *'nosplitright'* *'nospr'*
61996199
'splitright' 'spr' boolean (default off)
@@ -6855,7 +6855,7 @@ A jump table for the options with a short description can be found at |Q_op|.
68556855
'thesaurusfunc' 'tsrfu' string (default "")
68566856
global or local to buffer |global-local|
68576857
This option specifies a function to be used for thesaurus completion
6858-
with CTRL-X CTRL-T. |i_CTRL-X_CTRL-T| See |compl-thesaurusfunc|.
6858+
with CTRL-X CTRL-T. |i_CTRL-X_CTRL-T| See |compl-thesaurusfunc|.
68596859
The value can be the name of a function, a |lambda| or a |Funcref|.
68606860
See |option-value-function| for more information.
68616861

@@ -7082,9 +7082,9 @@ A jump table for the options with a short description can be found at |Q_op|.
70827082
*'vartabstop'* *'vts'*
70837083
'vartabstop' 'vts' string (default "")
70847084
local to buffer
7085-
Defines variable-width tab stops. The value is a comma-separated list
7086-
of widths in columns. Each width defines the number of columns
7087-
before the next tab stop; the last value repeats indefinitely.
7085+
Defines variable-width tab stops. The value is a comma-separated list
7086+
of widths in columns. Each width defines the number of columns before
7087+
the next tab stop; the last value repeats indefinitely.
70887088

70897089
For example: >
70907090
:set vartabstop=4,8
@@ -7416,16 +7416,16 @@ A jump table for the options with a short description can be found at |Q_op|.
74167416
expressions or with 'smartcase' enabled. However, the
74177417
case of the appended matched word may not exactly
74187418
match the case of the word in the buffer.
7419-
fuzzy Use |fuzzy-matching| to find completion matches. When
7419+
fuzzy Use |fuzzy-matching| to find completion matches. When
74207420
this value is specified, wildcard expansion will not
74217421
be used for completion. The matches will be sorted by
74227422
the "best match" rather than alphabetically sorted.
74237423
This will find more matches than the wildcard
7424-
expansion. Currently fuzzy matching based completion
7424+
expansion. Currently fuzzy matching based completion
74257425
is not supported for file and directory names and
74267426
instead wildcard expansion is used.
7427-
pum Display the completion matches using the popup menu
7428-
in the same style as the |ins-completion-menu|.
7427+
pum Display the completion matches using the popup menu in
7428+
the same style as the |ins-completion-menu|.
74297429
tagfile When using CTRL-D to list matching tags, the kind of
74307430
tag and the file of the tag is listed. Only one match
74317431
is displayed per line. Often used tag kinds are:

0 commit comments

Comments
 (0)