Skip to content

Commit d473c8c

Browse files
committed
Update runtime files.
1 parent f53c692 commit d473c8c

67 files changed

Lines changed: 448 additions & 327 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

runtime/doc/autocmd.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ DirChanged The working directory has changed in response
661661
to the |:cd| or |:lcd| commands, or as a
662662
result of the 'autochdir' option.
663663
The pattern can be:
664-
"window" to trigger on `:lcd
664+
"window" to trigger on `:lcd`
665665
"global" to trigger on `:cd`
666666
"auto" to trigger on 'autochdir'.
667667
"drop" to trigger on editing a file

runtime/doc/change.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,7 +1447,7 @@ to the name of an external program for Vim to use for text formatting. The
14471447
program.
14481448

14491449
*format-formatexpr*
1450-
The 'formatexpr' option can be set to a Vim Script function that performs
1450+
The 'formatexpr' option can be set to a Vim script function that performs
14511451
reformatting of the buffer. This should usually happen in an |ftplugin|,
14521452
since formatting is highly dependent on the type of file. It makes
14531453
sense to use an |autoload| script, so the corresponding script is only loaded
@@ -1481,7 +1481,7 @@ text. Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: >
14811481
14821482
You can then enable the formatting by executing: >
14831483
setlocal formatexpr=format#Format()
1484-
>
1484+
14851485
Note: this function explicitly returns non-zero when called from insert mode
14861486
(which basically means, text is inserted beyond the 'textwidth' limit). This
14871487
causes Vim to fall back to reformat the text by using the internal formatter.

runtime/doc/diff.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,12 +384,16 @@ Example (this does almost the same as 'diffexpr' being empty): >
384384
endif
385385
silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new .
386386
\ " > " . v:fname_out
387+
redraw!
387388
endfunction
388389
389390
The "-a" argument is used to force comparing the files as text, comparing as
390391
binaries isn't useful. The "--binary" argument makes the files read in binary
391392
mode, so that a CTRL-Z doesn't end the text on DOS.
392393

394+
The `redraw!` command may not be needed, depending on whether executing a
395+
shell command shows something on the display or not.
396+
393397
*E810* *E97*
394398
Vim will do a test if the diff output looks alright. If it doesn't, you will
395399
get an error message. Possible causes:

runtime/doc/eval.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,7 +2111,7 @@ cursor({list}) Number move cursor to position in {list}
21112111
debugbreak({pid}) Number interrupt process being debugged
21122112
deepcopy({expr} [, {noref}]) any make a full copy of {expr}
21132113
delete({fname} [, {flags}]) Number delete the file or directory {fname}
2114-
deletebufline({expr}, {first}[, {last}])
2114+
deletebufline({expr}, {first} [, {last}])
21152115
Number delete lines from buffer {expr}
21162116
did_filetype() Number |TRUE| if FileType autocmd event used
21172117
diff_filler({lnum}) Number diff filler lines about {lnum}
@@ -2477,7 +2477,7 @@ tolower({expr}) String the String {expr} switched to lowercase
24772477
toupper({expr}) String the String {expr} switched to uppercase
24782478
tr({src}, {fromstr}, {tostr}) String translate chars of {src} in {fromstr}
24792479
to chars in {tostr}
2480-
trim({text}[, {mask}]) String trim characters in {mask} from {text}
2480+
trim({text} [, {mask}]) String trim characters in {mask} from {text}
24812481
trunc({expr}) Float truncate Float {expr}
24822482
type({name}) Number type of variable {name}
24832483
undofile({name}) String undo file name for {name}
@@ -3529,7 +3529,7 @@ delete({fname} [, {flags}]) *delete()*
35293529
To delete a line from the buffer use |:delete| or
35303530
|deletebufline()|.
35313531

3532-
deletebufline({expr}, {first}[, {last}]) *deletebufline()*
3532+
deletebufline({expr}, {first} [, {last}]) *deletebufline()*
35333533
Delete lines {first} to {last} (inclusive) from buffer {expr}.
35343534
If {last} is omitted then delete line {first} only.
35353535
On success 0 is returned, on failure 1 is returned.
@@ -4307,7 +4307,7 @@ getbufinfo([{dict}])
43074307
endfor
43084308
<
43094309
To get buffer-local options use: >
4310-
getbufvar({bufnr}, '&')
4310+
getbufvar({bufnr}, '&option_name')
43114311
43124312
<
43134313
*getbufline()*
@@ -8591,9 +8591,8 @@ term_start({cmd}, {options}) *term_start()*
85918591
|job-options|. However, not all options can be used. These
85928592
are supported:
85938593
all timeout options
8594-
"stoponexit"
8595-
"callback", "out_cb", "err_cb"
8596-
"exit_cb", "close_cb"
8594+
"stoponexit", "cwd", "env"
8595+
"callback", "out_cb", "err_cb", "exit_cb", "close_cb"
85978596
"in_io", "in_top", "in_bot", "in_name", "in_buf"
85988597
"out_io", "out_name", "out_buf", "out_modifiable", "out_msg"
85998598
"err_io", "err_name", "err_buf", "err_modifiable", "err_msg"
@@ -8837,7 +8836,7 @@ tr({src}, {fromstr}, {tostr}) *tr()*
88378836
echo tr("<blob>", "<>", "{}")
88388837
< returns "{blob}"
88398838

8840-
trim({text}[, {mask}]) *trim()*
8839+
trim({text} [, {mask}]) *trim()*
88418840
Return {text} as a String where any character in {mask} is
88428841
removed from the beginning and end of {text}.
88438842
If {mask} is not given, {mask} is all characters up to 0x20,

runtime/doc/ft_rust.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@ It also has a few other mappings:
236236
Note: This binding is only available in MacVim.
237237

238238
==============================================================================
239-
vim:tw=78:sw=4:noet:ts=8:ft=help:norl:
239+
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/intro.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,9 @@ Virtual Replace mode Virtual Replace mode is similar to Replace mode, but
595595
If the 'showmode' option is on "-- VREPLACE --" is
596596
shown at the bottom of the window.
597597

598-
Insert Normal mode Entered when CTRL-O given in Insert mode. This is
599-
like Normal mode, but after executing one command Vim
600-
returns to Insert mode.
598+
Insert Normal mode Entered when CTRL-O is typed in Insert mode (see
599+
|i_CTRL-O|). This is like Normal mode, but after
600+
executing one command Vim returns to Insert mode.
601601
If the 'showmode' option is on "-- (insert) --" is
602602
shown at the bottom of the window.
603603

runtime/doc/options.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4373,7 +4373,7 @@ A jump table for the options with a short description can be found at |Q_op|.
43734373
methods. Use 'imdisable' to disable XIM then.
43744374

43754375
You can set 'imactivatefunc' and 'imstatusfunc' to handle IME/XIM
4376-
via external command if vim is not compiled with the |+xim|,
4376+
via external command if Vim is not compiled with the |+xim|,
43774377
|+multi_byte_ime| or |global-ime|.
43784378

43794379
*'imsearch'* *'ims'*
@@ -4480,6 +4480,7 @@ A jump table for the options with a short description can be found at |Q_op|.
44804480
so far, matches. The matched string is highlighted. If the pattern
44814481
is invalid or not found, nothing is shown. The screen will be updated
44824482
often, this is only useful on fast terminals.
4483+
Also applies to the `:s`, `:g` and `:v` commands.
44834484
Note that the match will be shown, but the cursor will return to its
44844485
original position when no match is found and when pressing <Esc>. You
44854486
still need to finish the search command with <Enter> to move the
@@ -4493,9 +4494,9 @@ A jump table for the options with a short description can be found at |Q_op|.
44934494
The highlighting can be set with the 'i' flag in 'highlight'.
44944495
When 'hlsearch' is on, all matched strings are highlighted too while
44954496
typing a search command. See also: 'hlsearch'.
4496-
If you don't want turn 'hlsearch' on, but want to highlight all matches
4497-
while searching, you can turn on and off 'hlsearch' with autocmd.
4498-
Example: >
4497+
If you don't want to turn 'hlsearch' on, but want to highlight all
4498+
matches while searching, you can turn on and off 'hlsearch' with
4499+
autocmd. Example: >
44994500
augroup vimrc-incsearch-highlight
45004501
autocmd!
45014502
autocmd CmdlineEnter /,\? :set hlsearch
@@ -6650,7 +6651,8 @@ A jump table for the options with a short description can be found at |Q_op|.
66506651
tabpages all tab pages; without this only the current tab page
66516652
is restored, so that you can make a session for each
66526653
tab page separately
6653-
terminal include terminal windows where the command can be restored
6654+
terminal include terminal windows where the command can be
6655+
restored
66546656
unix with Unix end-of-line format (single <NL>), even when
66556657
on Windows or DOS
66566658
winpos position of the whole Vim window
@@ -6686,7 +6688,7 @@ A jump table for the options with a short description can be found at |Q_op|.
66866688
Example with escaped space (Vim will do this when initializing the
66876689
option from $SHELL): >
66886690
:set shell=/bin/with\\\ space/sh
6689-
< The resulting value of 'shell' is "/bin/with\ space/sh", two
6691+
< The resulting value of 'shell' is "/bin/with\ space/sh", two
66906692
backslashes are consumed by `:set`.
66916693

66926694
Under MS-Windows, when the executable ends in ".com" it must be
@@ -7512,7 +7514,7 @@ A jump table for the options with a short description can be found at |Q_op|.
75127514
line is displayed. The current buffer and current window will be set
75137515
temporarily to that of the window (and buffer) whose statusline is
75147516
currently being drawn. The expression will evaluate in this context.
7515-
The variable "actual_curbuf" is set to the 'bufnr()' number of the
7517+
The variable "g:actual_curbuf" is set to the `bufnr()` number of the
75167518
real current buffer.
75177519

75187520
The 'statusline' option will be evaluated in the |sandbox| if set from

runtime/doc/os_qnx.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ Todo:
135135
- Replace usage of fork() with spawn() when launching external
136136
programs.
137137

138-
vim:tw=78:sw=4:ts=8:noet:ts=8:ft=help:norl:
138+
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

runtime/doc/print.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ Note: If you have problems printing with |:hardcopy|, an alternative is to use
4646
'printexpr' through |v:cmdarg|. Otherwise [arguments]
4747
is ignored. 'printoptions' can be used to specify
4848
paper size, duplex, etc.
49+
Note: If you want PDF, there are tools such as
50+
"ps2pdf" that can convert the PostScript to PDF.
4951

5052
:[range]ha[rdcopy][!] >{filename}
5153
As above, but write the resulting PostScript in file

runtime/doc/quickfix.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ compiler (see |errorformat| below).
4646

4747
*quickfix-ID*
4848
Each quickfix list has a unique identifier called the quickfix ID and this
49-
number will not change within a Vim session. The getqflist() function can be
49+
number will not change within a Vim session. The |getqflist()| function can be
5050
used to get the identifier assigned to a list. There is also a quickfix list
5151
number which may change whenever more than ten lists are added to a quickfix
5252
stack.
@@ -68,7 +68,7 @@ the location list is destroyed.
6868
Every quickfix and location list has a read-only changedtick variable that
6969
tracks the total number of changes made to the list. Every time the quickfix
7070
list is modified, this count is incremented. This can be used to perform an
71-
action only when the list has changed. The getqflist() and getloclist()
71+
action only when the list has changed. The |getqflist()| and |getloclist()|
7272
functions can be used to query the current value of changedtick. You cannot
7373
change the changedtick variable.
7474

@@ -602,7 +602,7 @@ present). Examples: >
602602
echo getloclist(2, {'winid' : 1}).winid
603603
<
604604
*getqflist-examples*
605-
The getqflist() and getloclist() functions can be used to get the various
605+
The |getqflist()| and |getloclist()| functions can be used to get the various
606606
attributes of a quickfix and location list respectively. Some examples for
607607
using these functions are below:
608608
>
@@ -659,7 +659,7 @@ using these functions are below:
659659
:echo getloclist(3, {'winid' : 0}).winid
660660
<
661661
*setqflist-examples*
662-
The setqflist() and setloclist() functions can be used to set the various
662+
The |setqflist()| and |setloclist()| functions can be used to set the various
663663
attributes of a quickfix and location list respectively. Some examples for
664664
using these functions are below:
665665
>

0 commit comments

Comments
 (0)