aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-11-22 10:53:57 +0100
committerGitHub <noreply@github.com>2021-11-22 10:53:57 +0100
commite6c46bac3f590bfa4ac544705f195e5122c02d7c (patch)
tree596acb3dab84db56c4d44083bc4ce6d30459fa78 /runtime/doc
parent64abd7be7993ed3fa031b5d71a4482871108093a (diff)
downloadrneovim-e6c46bac3f590bfa4ac544705f195e5122c02d7c.tar.gz
rneovim-e6c46bac3f590bfa4ac544705f195e5122c02d7c.tar.bz2
rneovim-e6c46bac3f590bfa4ac544705f195e5122c02d7c.zip
vim-patch:88a4205f1cfb (#16399)
Update runtime files https://github.com/vim/vim/commit/88a4205f1cfbdc328e987ab00521fc8a22447fc3
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/autocmd.txt2
-rw-r--r--runtime/doc/eval.txt13
-rw-r--r--runtime/doc/helphelp.txt4
-rw-r--r--runtime/doc/map.txt5
-rw-r--r--runtime/doc/usr_20.txt2
-rw-r--r--runtime/doc/visual.txt3
6 files changed, 19 insertions, 10 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 2737ac9b9f..7ca6b3cd8e 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -57,7 +57,7 @@ The special pattern <buffer> or <buffer=N> defines a buffer-local autocommand.
See |autocmd-buflocal|.
Note: The ":autocmd" command can only be followed by another command when the
-'|' appears before {cmd}. This works: >
+'|' appears where the pattern is expected. This works: >
:augroup mine | au! BufRead | augroup END
But this sees "augroup" as part of the defined command: >
:augroup mine | au! BufRead * | augroup END
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 58d5d30146..02ff9fc591 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -5136,8 +5136,8 @@ getline({lnum} [, {end}])
digit, |line()| is called to translate the String into a Number.
To get the line under the cursor: >
getline(".")
-< When {lnum} is smaller than 1 or bigger than the number of
- lines in the buffer, an empty string is returned.
+< When {lnum} is a number smaller than 1 or bigger than the
+ number of lines in the buffer, an empty string is returned.
When {end} is given the result is a |List| where each item is
a line from the current buffer in the range {lnum} to {end},
@@ -7464,15 +7464,18 @@ printf({fmt}, {expr1} ...) *printf()*
field width. If the converted value has fewer bytes
than the field width, it will be padded with spaces on
the left (or right, if the left-adjustment flag has
- been given) to fill out the field width.
+ been given) to fill out the field width. For the S
+ conversion the count is in cells.
.precision
An optional precision, in the form of a period '.'
followed by an optional digit string. If the digit
string is omitted, the precision is taken as zero.
This gives the minimum number of digits to appear for
- d, o, x, and X conversions, or the maximum number of
- bytes to be printed from a string for s conversions.
+ d, o, x, and X conversions, the maximum number of
+ bytes to be printed from a string for s conversions,
+ or the maximum number of cells to be printed from a
+ string for S conversions.
For floating point it is the number of digits after
the decimal point.
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index c884eea54f..e7b489d6e1 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -319,7 +319,7 @@ Hints for translators:
3. Writing help files *help-writing*
For ease of use, a Vim help file for a plugin should follow the format of the
-standard Vim help files, except fot the fist line. If you are writing a new
+standard Vim help files, except for the first line. If you are writing a new
help file it's best to copy one of the existing files and use it as a
template.
@@ -332,7 +332,7 @@ remainder of the line, after a Tab, describes the plugin purpose in a short
way. This will show up in the "LOCAL ADDITIONS" section of the main help
file. Check there that it shows up properly: |local-additions|.
-If you want to add a version number of last modification date, put it in the
+If you want to add a version number or last modification date, put it in the
second line, right aligned.
At the bottom of the help file, place a Vim modeline to set the 'textwidth'
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 0b9ac42898..0ea2565694 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -81,6 +81,9 @@ modes.
Remove the mapping of {lhs} for the modes where the
map command applies. The mapping may remain defined
for other modes where it applies.
+ It also works when {lhs} matches the {rhs} of a
+ mapping. This is for when when an abbreviation
+ applied.
Note: Trailing spaces are included in the {lhs}. This
unmap does NOT work: >
:map @@ foo
@@ -320,6 +323,8 @@ Note:
- For the same reason, |keycodes| like <C-R><C-W> are interpreted as plain,
unmapped keys.
- The command is not echo'ed, no need for <silent>.
+- The {rhs} is not subject to abbreviations nor to other mappings, even if the
+ mapping is recursive.
- In Visual mode you can use `line('v')` and `col('v')` to get one end of the
Visual area, the cursor is at the other end.
- In select-mode, |:map| and |:vmap| command mappings are executed in
diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt
index cff5c7d2f2..6a8836c8e8 100644
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -292,7 +292,7 @@ to newer commands.
There are actually five histories. The ones we will mention here are for ":"
commands and for "/" and "?" search commands. The "/" and "?" commands share
the same history, because they are both search commands. The three other
-histories are for expressions, debug more commands and input lines for the
+histories are for expressions, debug mode commands and input lines for the
input() function. |cmdline-history|
Suppose you have done a ":set" command, typed ten more colon commands and then
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 111588e43a..4a69fc989b 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -360,7 +360,8 @@ same amount of text as the last time:
last line the same number of characters as in the last line the last time.
The start of the text is the Cursor position. If the "$" command was used as
one of the last commands to extend the highlighted text, the repeating will
-be applied up to the rightmost column of the longest line.
+be applied up to the rightmost column of the longest line. Any count passed
+to the `.` command is not used.
==============================================================================