aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-28 22:51:23 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-28 23:04:14 -0400
commit27fb03f5a03db6738967f9e0e0ea85ea0fab7592 (patch)
treeef9297f9456bd18f3cd3b39fa43c7f18ccc52601 /runtime/doc
parentbb172c5104531b9060add7e0086afc65e7dc0414 (diff)
downloadrneovim-27fb03f5a03db6738967f9e0e0ea85ea0fab7592.tar.gz
rneovim-27fb03f5a03db6738967f9e0e0ea85ea0fab7592.tar.bz2
rneovim-27fb03f5a03db6738967f9e0e0ea85ea0fab7592.zip
vim-patch:7ff78465f705
Update runtime files https://github.com/vim/vim/commit/7ff78465f7057a672a6de0d75d56286da253501b
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/editing.txt2
-rw-r--r--runtime/doc/eval.txt7
-rw-r--r--runtime/doc/pattern.txt2
-rw-r--r--runtime/doc/syntax.txt2
-rw-r--r--runtime/doc/usr_11.txt2
-rw-r--r--runtime/doc/various.txt2
6 files changed, 10 insertions, 7 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 203165845e..564f2302f5 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1334,7 +1334,7 @@ to 0, 'modeline' off, 'expandtab' off). Setting the 'binary' option has the
same effect. Don't forget to do this before reading the file.
There are a few things to remember when editing binary files:
-- When editing executable files the number of characters must not change.
+- When editing executable files the number of bytes must not change.
Use only the "R" or "r" command to change text. Do not delete characters
with "x" or by backspacing.
- Set the 'textwidth' option to 0. Otherwise lines will unexpectedly be
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 6664362927..e79f97ee38 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3328,6 +3328,7 @@ deepcopy({expr}[, {noref}]) *deepcopy()* *E698*
copy, and vice versa. When an item is a |List|, a copy for it
is made, recursively. Thus changing an item in the copy does
not change the contents of the original |List|.
+
When {noref} is omitted or zero a contained |List| or
|Dictionary| is only copied once. All references point to
this single copy. With {noref} set to 1 every occurrence of a
@@ -7548,6 +7549,8 @@ setloclist({nr}, {list}[, {action}[, {what}]]) *setloclist()*
Otherwise, same as |setqflist()|.
Also see |location-list|.
+ For {action} see |setqflist-action|.
+
If the optional {what} dictionary argument is supplied, then
only the items listed in {what} are set. Refer to |setqflist()|
for the list of supported keys in {what}.
@@ -7617,7 +7620,7 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
only the items listed in {what} are set. The first {list}
argument is ignored. See below for the supported items in
{what}.
-
+ *setqflist-what*
When {what} is not present, the items in {list} are used. Each
item must be a dictionary. Non-dictionary items in {list} are
ignored. Each dictionary item can contain the following
@@ -7654,7 +7657,7 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
Note that the list is not exactly the same as what
|getqflist()| returns.
- {action} values: *E927*
+ {action} values: *setqflist-action* *E927*
'a' The items from {list} are added to the existing
quickfix list. If there is no existing list, then a
new list is created.
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 7129c6cd58..e90532974c 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1267,7 +1267,7 @@ not match in "càt" (where the a has the composing character 0x0300), but
0xe1, it does not have a compositing character). It does match "cat" (where
the a is just an a).
-When a composing character appears at the start of the pattern of after an
+When a composing character appears at the start of the pattern or after an
item that doesn't include the composing character, a match is found at any
character that includes this composing character.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 56f12eadcb..124117169a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1380,7 +1380,7 @@ to your startup file.
EUPHORIA *euphoria3.vim* *euphoria4.vim* *ft-euphoria-syntax*
-Two syntax highlighting files exists for Euphoria. One for Euphoria
+Two syntax highlighting files exist for Euphoria. One for Euphoria
version 3.1.1, which is the default syntax highlighting file, and one for
Euphoria version 4.0.5 or later.
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 2852852d16..d7d22c4227 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -256,7 +256,7 @@ O Open the file readonly. Use this when you just want to view the file and
E Edit the file anyway. Use this with caution! If the file is being edited
in another Vim, you might end up with two versions of the file. Vim will
- try to warn you when this happens, but better be safe then sorry.
+ try to warn you when this happens, but better be safe than sorry.
R Recover the file from the swap file. Use this if you know that the swap
file contains changes that you want to recover.
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 21d5610a97..52e2d9828b 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -515,7 +515,7 @@ up mappings to simulate the commands that less supports. Otherwise, you can
still use the Vim commands.
This isn't perfect. For example, when viewing a short file Vim will still use
-the whole screen. But it works good enough for most uses, and you get syntax
+the whole screen. But it works well enough for most uses, and you get syntax
highlighting.
The "h" key will give you a short overview of the available commands.