aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2022-10-05 10:56:53 +0200
committerGitHub <noreply@github.com>2022-10-05 10:56:53 +0200
commit06f4edc864479fb121d514ec1e7253dba85b740d (patch)
tree08ebf8e82569a6993b9ae52957437fb9ac2f4dfb /runtime/doc
parent759259e8af2f6f5e840fcbd687caaaf5f2b9b676 (diff)
downloadrneovim-06f4edc864479fb121d514ec1e7253dba85b740d.tar.gz
rneovim-06f4edc864479fb121d514ec1e7253dba85b740d.tar.bz2
rneovim-06f4edc864479fb121d514ec1e7253dba85b740d.zip
vim-patch:partial:f269eabc6c4f (#20470)
Update runtime files https://github.com/vim/vim/commit/f269eabc6c4f5bdcef989cd5b4b95ba8ccaa4d8a
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/builtin.txt12
-rw-r--r--runtime/doc/fold.txt2
-rw-r--r--runtime/doc/insert.txt14
-rw-r--r--runtime/doc/options.txt2
4 files changed, 18 insertions, 12 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 9de8db1f43..ad757981b0 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -6,6 +6,8 @@
Builtin functions *builtin-functions*
+For functions grouped by what they are used for see |function-list|.
+
Type |gO| to see the table of contents.
==============================================================================
@@ -6168,7 +6170,9 @@ reg_recording() *reg_recording()*
Returns the single letter name of the register being recorded.
Returns an empty string when not recording. See |q|.
-reltime([{start} [, {end}]]) *reltime()*
+reltime()
+reltime({start})
+reltime({start}, {end}) *reltime()*
Return an item that represents a time value. The item is a
list with items that depend on the system.
The item can be passed to |reltimestr()| to convert it to a
@@ -6222,7 +6226,8 @@ reltimestr({time}) *reltimestr()*
Can also be used as a |method|: >
reltime(start)->reltimestr()
<
-remove({list}, {idx} [, {end}]) *remove()*
+remove({list}, {idx})
+remove({list}, {idx}, {end}) *remove()*
Without {end}: Remove the item at {idx} from |List| {list} and
return the item.
With {end}: Remove items from {idx} to {end} (inclusive) and
@@ -6240,7 +6245,8 @@ remove({list}, {idx} [, {end}]) *remove()*
Can also be used as a |method|: >
mylist->remove(idx)
-remove({blob}, {idx} [, {end}])
+remove({blob}, {idx})
+remove({blob}, {idx}, {end})
Without {end}: Remove the byte at {idx} from |Blob| {blob} and
return the byte.
With {end}: Remove bytes from {idx} to {end} (inclusive) and
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 9e3d78faff..e97a0a6459 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -491,7 +491,7 @@ is evaluated to obtain the text displayed for a closed fold. Example: >
This shows the first line of the fold, with "/*", "*/" and "{{{" removed.
Note the use of backslashes to avoid some characters to be interpreted by the
-":set" command. It's simpler to define a function and call that: >
+":set" command. It is much simpler to define a function and call it: >
:set foldtext=MyFoldText()
:function MyFoldText()
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 63ceab78a8..792c6ee6f4 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -650,9 +650,9 @@ When the popup menu is displayed there are a few more special keys, see
|popupmenu-keys|.
Note: The keys that are valid in CTRL-X mode are not mapped. This allows for
-":map ^F ^X^F" to work (where ^F is CTRL-F and ^X is CTRL-X). The key that
-ends CTRL-X mode (any key that is not a valid CTRL-X mode command) is mapped.
-Also, when doing completion with 'complete' mappings apply as usual.
+`:map <C-F> <C-X><C-F>` to work. The key that ends CTRL-X mode (any key that
+is not a valid CTRL-X mode command) is mapped. Also, when doing completion
+with 'complete' mappings apply as usual.
*E565*
Note: While completion is active Insert mode can't be used recursively and
@@ -661,10 +661,10 @@ will generate an E565 error.
The following mappings are suggested to make typing the completion commands
a bit easier (although they will hide other commands): >
- :inoremap ^] ^X^]
- :inoremap ^F ^X^F
- :inoremap ^D ^X^D
- :inoremap ^L ^X^L
+ :inoremap <C-]> <C-X><C-]>
+ :inoremap <C-F> <C-X><C-F>
+ :inoremap <C-D> <C-X><C-D>
+ :inoremap <C-L> <C-X><C-L>
As a special case, typing CTRL-R to perform register insertion (see
|i_CTRL-R|) will not exit CTRL-X mode. This is primarily to allow the use of
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b6431c9a40..15fc551dd9 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2130,7 +2130,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'display'* *'dy'*
'display' 'dy' string (default "lastline,msgsep")
global
- Change the way text is displayed. This is comma-separated list of
+ Change the way text is displayed. This is a comma-separated list of
flags:
lastline When included, as much as possible of the last line
in a window will be displayed. "@@@" is put in the