mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:df62c62: runtime(doc): grammar fixes in options.txt (#29729)

Browse Source 
closes: vim/vim#15265

df62c62177

Co-authored-by: Dominique Pellé <dominique.pelle@gmail.com>
This commit is contained in:
zeertzjq
2024-07-16 06:24:02 +08:00
committed by GitHub
parent b213f5169c
commit c2b51e6c41
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/options.txt
View File

@@ -1092,7 +1092,7 @@ A jump table for the options with a short description can be found at |Q_op|.
applying 'breakindent', even if the resulting applying 'breakindent', even if the resulting
text should normally be narrower. This prevents text should normally be narrower. This prevents
text indented almost to the right window border text indented almost to the right window border
occupying lot of vertical space when broken. occupying lots of vertical space when broken.
(default: 20) (default: 20)
shift:{n} After applying 'breakindent', the wrapped line's shift:{n} After applying 'breakindent', the wrapped line's
beginning will be shifted by the given number of beginning will be shifted by the given number of
@@ -3447,7 +3447,7 @@ A jump table for the options with a short description can be found at |Q_op|.
in Insert mode as specified with the 'indentkeys' option. in Insert mode as specified with the 'indentkeys' option.
When this option is not empty, it overrules the 'cindent' and When this option is not empty, it overrules the 'cindent' and
'smartindent' indenting. When 'lisp' is set, this option is 'smartindent' indenting. When 'lisp' is set, this option is
is only used when 'lispoptions' contains "expr:1". only used when 'lispoptions' contains "expr:1".
The expression is evaluated with |v:lnum| set to the line number for The expression is evaluated with |v:lnum| set to the line number for
which the indent is to be computed. The cursor is also in this line which the indent is to be computed. The cursor is also in this line
when the expression is evaluated (but it may be moved around). when the expression is evaluated (but it may be moved around).
@@ -3699,7 +3699,7 @@ A jump table for the options with a short description can be found at |Q_op|.
part can be in one of two forms: part can be in one of two forms:
1. A list of pairs. Each pair is a "from" character immediately 1. A list of pairs. Each pair is a "from" character immediately
followed by the "to" character. Examples: "aA", "aAbBcC". followed by the "to" character. Examples: "aA", "aAbBcC".
2. A list of "from" characters, a semi-colon and a list of "to" 2. A list of "from" characters, a semicolon and a list of "to"
characters. Example: "abc;ABC" characters. Example: "abc;ABC"
Example: "aA,fgh;FGH,cCdDeE" Example: "aA,fgh;FGH,cCdDeE"
Special characters need to be preceded with a backslash. These are Special characters need to be preceded with a backslash. These are
@@ -3767,7 +3767,7 @@ A jump table for the options with a short description can be found at |Q_op|.
update use |:redraw|. update use |:redraw|.
This may occasionally cause display errors. It is only meant to be set This may occasionally cause display errors. It is only meant to be set
temporarily when performing an operation where redrawing may cause temporarily when performing an operation where redrawing may cause
flickering or cause a slow down. flickering or cause a slowdown.
*'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'* *'linebreak'* *'lbr'* *'nolinebreak'* *'nolbr'*
'linebreak' 'lbr' boolean (default off) 'linebreak' 'lbr' boolean (default off)
@@ -4610,7 +4610,7 @@ A jump table for the options with a short description can be found at |Q_op|.
set path+= set path+=
< To use an environment variable, you probably need to replace the < To use an environment variable, you probably need to replace the
separator. Here is an example to append $INCL, in which directory separator. Here is an example to append $INCL, in which directory
names are separated with a semi-colon: >vim names are separated with a semicolon: >vim
let &path = &path .. "," .. substitute($INCL, ';', ',', 'g') let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
< Replace the ';' with a ':' or whatever separator is used. Note that < Replace the ';' with a ':' or whatever separator is used. Note that
this doesn't work when $INCL contains a comma or white space. this doesn't work when $INCL contains a comma or white space.
@@ -5879,7 +5879,7 @@ A jump table for the options with a short description can be found at |Q_op|.
minus two. minus two.
timeout:{millisec} Limit the time searching for suggestions to timeout:{millisec} Limit the time searching for suggestions to
{millisec} milli seconds. Applies to the following {millisec} milliseconds. Applies to the following
methods. When omitted the limit is 5000. When methods. When omitted the limit is 5000. When
negative there is no limit. negative there is no limit.

12
runtime/lua/vim/_meta/options.lua generated
View File

@@ -544,7 +544,7 @@ vim.wo.bri = vim.wo.breakindent
--- applying 'breakindent', even if the resulting --- applying 'breakindent', even if the resulting
--- text should normally be narrower. This prevents --- text should normally be narrower. This prevents
--- text indented almost to the right window border --- text indented almost to the right window border
--- occupying lot of vertical space when broken. --- occupying lots of vertical space when broken.
--- (default: 20) --- (default: 20)
--- shift:{n} After applying 'breakindent', the wrapped line's --- shift:{n} After applying 'breakindent', the wrapped line's
--- beginning will be shifted by the given number of --- beginning will be shifted by the given number of
@@ -3340,7 +3340,7 @@ vim.go.is = vim.go.incsearch
--- in Insert mode as specified with the 'indentkeys' option. --- in Insert mode as specified with the 'indentkeys' option.
--- When this option is not empty, it overrules the 'cindent' and --- When this option is not empty, it overrules the 'cindent' and
--- 'smartindent' indenting. When 'lisp' is set, this option is --- 'smartindent' indenting. When 'lisp' is set, this option is
--- is only used when 'lispoptions' contains "expr:1". --- only used when 'lispoptions' contains "expr:1".
--- The expression is evaluated with `v:lnum` set to the line number for --- The expression is evaluated with `v:lnum` set to the line number for
--- which the indent is to be computed. The cursor is also in this line --- which the indent is to be computed. The cursor is also in this line
--- when the expression is evaluated (but it may be moved around). --- when the expression is evaluated (but it may be moved around).
@@ -3641,7 +3641,7 @@ vim.go.kp = vim.go.keywordprg
--- part can be in one of two forms: --- part can be in one of two forms:
--- 1. A list of pairs. Each pair is a "from" character immediately --- 1. A list of pairs. Each pair is a "from" character immediately
--- followed by the "to" character. Examples: "aA", "aAbBcC". --- followed by the "to" character. Examples: "aA", "aAbBcC".
--- 2. A list of "from" characters, a semi-colon and a list of "to" --- 2. A list of "from" characters, a semicolon and a list of "to"
--- characters. Example: "abc;ABC" --- characters. Example: "abc;ABC"
--- Example: "aA,fgh;FGH,cCdDeE" --- Example: "aA,fgh;FGH,cCdDeE"
--- Special characters need to be preceded with a backslash. These are --- Special characters need to be preceded with a backslash. These are
@@ -3733,7 +3733,7 @@ vim.go.ls = vim.go.laststatus
--- update use `:redraw`. --- update use `:redraw`.
--- This may occasionally cause display errors. It is only meant to be set --- This may occasionally cause display errors. It is only meant to be set
--- temporarily when performing an operation where redrawing may cause --- temporarily when performing an operation where redrawing may cause
--- flickering or cause a slow down. --- flickering or cause a slowdown.
--- ---
--- @type boolean --- @type boolean
vim.o.lazyredraw = false vim.o.lazyredraw = false
@@ -4787,7 +4787,7 @@ vim.go.pm = vim.go.patchmode
--- ``` --- ```
--- To use an environment variable, you probably need to replace the --- To use an environment variable, you probably need to replace the
--- separator. Here is an example to append $INCL, in which directory --- separator. Here is an example to append $INCL, in which directory
--- names are separated with a semi-colon: --- names are separated with a semicolon:
--- ---
--- ```vim --- ```vim
--- let &path = &path .. "," .. substitute($INCL, ';', ',', 'g') --- let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
@@ -6283,7 +6283,7 @@ vim.bo.spo = vim.bo.spelloptions
--- minus two. --- minus two.
--- ---
--- timeout:{millisec} Limit the time searching for suggestions to --- timeout:{millisec} Limit the time searching for suggestions to
--- {millisec} milli seconds. Applies to the following --- {millisec} milliseconds. Applies to the following
--- methods. When omitted the limit is 5000. When --- methods. When omitted the limit is 5000. When
--- negative there is no limit. --- negative there is no limit.
--- ---

12
src/nvim/options.lua
View File

@@ -747,7 +747,7 @@ return {
applying 'breakindent', even if the resulting applying 'breakindent', even if the resulting
text should normally be narrower. This prevents text should normally be narrower. This prevents
text indented almost to the right window border text indented almost to the right window border
occupying lot of vertical space when broken. occupying lots of vertical space when broken.
(default: 20) (default: 20)
shift:{n} After applying 'breakindent', the wrapped line's shift:{n} After applying 'breakindent', the wrapped line's
beginning will be shifted by the given number of beginning will be shifted by the given number of
@@ -4229,7 +4229,7 @@ return {
in Insert mode as specified with the 'indentkeys' option. in Insert mode as specified with the 'indentkeys' option.
When this option is not empty, it overrules the 'cindent' and When this option is not empty, it overrules the 'cindent' and
'smartindent' indenting. When 'lisp' is set, this option is 'smartindent' indenting. When 'lisp' is set, this option is
is only used when 'lispoptions' contains "expr:1". only used when 'lispoptions' contains "expr:1".
The expression is evaluated with |v:lnum| set to the line number for The expression is evaluated with |v:lnum| set to the line number for
which the indent is to be computed. The cursor is also in this line which the indent is to be computed. The cursor is also in this line
when the expression is evaluated (but it may be moved around). when the expression is evaluated (but it may be moved around).
@@ -4623,7 +4623,7 @@ return {
part can be in one of two forms: part can be in one of two forms:
1. A list of pairs. Each pair is a "from" character immediately 1. A list of pairs. Each pair is a "from" character immediately
followed by the "to" character. Examples: "aA", "aAbBcC". followed by the "to" character. Examples: "aA", "aAbBcC".
2. A list of "from" characters, a semi-colon and a list of "to" 2. A list of "from" characters, a semicolon and a list of "to"
characters. Example: "abc;ABC" characters. Example: "abc;ABC"
Example: "aA,fgh;FGH,cCdDeE" Example: "aA,fgh;FGH,cCdDeE"
Special characters need to be preceded with a backslash. These are Special characters need to be preceded with a backslash. These are
@@ -4736,7 +4736,7 @@ return {
update use |:redraw|. update use |:redraw|.
This may occasionally cause display errors. It is only meant to be set This may occasionally cause display errors. It is only meant to be set
temporarily when performing an operation where redrawing may cause temporarily when performing an operation where redrawing may cause
flickering or cause a slow down. flickering or cause a slowdown.
]=], ]=],
full_name = 'lazyredraw', full_name = 'lazyredraw',
scope = { 'global' }, scope = { 'global' },
@@ -6012,7 +6012,7 @@ return {
set path+= set path+=
< To use an environment variable, you probably need to replace the < To use an environment variable, you probably need to replace the
separator. Here is an example to append $INCL, in which directory separator. Here is an example to append $INCL, in which directory
names are separated with a semi-colon: >vim names are separated with a semicolon: >vim
let &path = &path .. "," .. substitute($INCL, ';', ',', 'g') let &path = &path .. "," .. substitute($INCL, ';', ',', 'g')
< Replace the ';' with a ':' or whatever separator is used. Note that < Replace the ';' with a ':' or whatever separator is used. Note that
this doesn't work when $INCL contains a comma or white space. this doesn't work when $INCL contains a comma or white space.
@@ -7921,7 +7921,7 @@ return {
minus two. minus two.
timeout:{millisec} Limit the time searching for suggestions to timeout:{millisec} Limit the time searching for suggestions to
{millisec} milli seconds. Applies to the following {millisec} milliseconds. Applies to the following
methods. When omitted the limit is 5000. When methods. When omitted the limit is 5000. When
negative there is no limit. negative there is no limit.