Skip to content

Commit d1caa94

Browse files
committed
Update runtime files
1 parent 7b293c7 commit d1caa94

24 files changed

Lines changed: 187 additions & 88 deletions

runtime/autoload/ccomplete.vim

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: C
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2018 Aug 20
4+
" Last Change: 2020 Apr 08
55

66
let s:cpo_save = &cpo
77
set cpo&vim
@@ -635,3 +635,5 @@ endfunc
635635

636636
let &cpo = s:cpo_save
637637
unlet s:cpo_save
638+
639+
" vim: noet sw=2 sts=2

runtime/autoload/dist/ft.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim functions for file type detection
22
"
33
" Maintainer: Bram Moolenaar <[email protected]>
4-
" Last Change: 2020 Jan 02
4+
" Last Change: 2020 Mar 30
55

66
" These functions are moved here from runtime/filetype.vim to make startup
77
" faster.
@@ -325,7 +325,7 @@ endfunc
325325

326326
func dist#ft#FTmm()
327327
let n = 1
328-
while n < 10
328+
while n < 20
329329
let line = getline(n)
330330
if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
331331
setf objcpp

runtime/doc/change.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1458,7 +1458,7 @@ text. Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: >
14581458
func! format#Format()
14591459
" only reformat on explicit gq command
14601460
if mode() != 'n'
1461-
" fall back to Vims internal reformatting
1461+
" fall back to Vim's internal reformatting
14621462
return 1
14631463
endif
14641464
let lines = getline(v:lnum, v:lnum + v:count - 1)

runtime/doc/eval.txt

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.2. Last change: 2020 Mar 26
1+
*eval.txt* For Vim version 8.2. Last change: 2020 Apr 08
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5137,10 +5137,11 @@ getcompletion({pat}, {type} [, {filtered}]) *getcompletion()*
51375137
<
51385138
*getcurpos()*
51395139
getcurpos() Get the position of the cursor. This is like getpos('.'), but
5140-
includes an extra item in the list:
5141-
[bufnum, lnum, col, off, curswant] ~
5140+
includes an extra "curswant" item in the list:
5141+
[0, lnum, col, off, curswant] ~
51425142
The "curswant" number is the preferred column when moving the
51435143
cursor vertically. Also see |getpos()|.
5144+
The first "bufnum" item is always zero.
51445145

51455146
This can be used to save and restore the cursor position: >
51465147
let save_cursor = getcurpos()
@@ -8917,18 +8918,10 @@ settagstack({nr}, {dict} [, {action}]) *settagstack()*
89178918

89188919
Returns zero for success, -1 for failure.
89198920

8920-
Examples:
8921-
Set current index of the tag stack to 4: >
8922-
call settagstack(1005, {'curidx' : 4})
8923-
8924-
< Empty the tag stack of window 3: >
8921+
Examples (for more examples see |tagstack-examples||):
8922+
Empty the tag stack of window 3: >
89258923
call settagstack(3, {'items' : []})
89268924
8927-
< Push a new item onto the tag stack: >
8928-
let pos = [bufnr('myfile.txt'), 10, 1, 0]
8929-
let newtag = [{'tagname' : 'mytag', 'from' : pos}]
8930-
call settagstack(2, {'items' : newtag}, 'a')
8931-
89328925
< Save and restore the tag stack: >
89338926
let stack = gettagstack(1003)
89348927
" do something else
@@ -10876,6 +10869,7 @@ hpux HP-UX version of Vim.
1087610869
iconv Can use iconv() for conversion.
1087710870
insert_expand Compiled with support for CTRL-X expansion commands in
1087810871
Insert mode. (always true)
10872+
job Compiled with support for |channel| and |job|
1087910873
jumplist Compiled with |jumplist| support.
1088010874
keymap Compiled with 'keymap' support.
1088110875
lambda Compiled with |lambda| support.
@@ -11240,8 +11234,8 @@ It is allowed to define another function inside a function body.
1124011234
You can provide default values for positional named arguments. This makes
1124111235
them optional for function calls. When a positional argument is not
1124211236
specified at a call, the default expression is used to initialize it.
11243-
This only works for functions declared with `:function`, not for lambda
11244-
expressions |expr-lambda|.
11237+
This only works for functions declared with `:function` or `:def`, not for
11238+
lambda expressions |expr-lambda|.
1124511239

1124611240
Example: >
1124711241
function Something(key, value = 10)
@@ -11279,9 +11273,10 @@ Example that does NOT work: >
1127911273
:function NoGood(first = a:second, second = 10)
1128011274
:endfunction
1128111275
<
11282-
When not using "...", the number of arguments in a function call must be equal
11283-
to the number of mandatory named arguments. When using "...", the number of
11284-
arguments may be larger.
11276+
When not using "...", the number of arguments in a function call must be at
11277+
least equal to the number of mandatory named arguments. When using "...", the
11278+
number of arguments may be larger than the total of mandatory and optional
11279+
arguments.
1128511280

1128611281
*local-variables*
1128711282
Inside a function local variables can be used. These will disappear when the
@@ -11638,7 +11633,7 @@ This does NOT work: >
1163811633
Like above, but append/add/subtract the value for each
1163911634
|List| item.
1164011635

11641-
:let [{name}, ..., ; {lastname}] = {expr1}
11636+
:let [{name}, ..., ; {lastname}] = {expr1} *E452*
1164211637
Like |:let-unpack| above, but the |List| may have more
1164311638
items than there are names. A list of the remaining
1164411639
items is assigned to {lastname}. If there are no

runtime/doc/gui_w32.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ With..." menu. This means you can use Vim to edit many files. Not every file
199199
One reason to add this is to be able to edit HTML files directly from Internet
200200
Explorer. To enable this use the "Tools" menu, "Internet Options..." entry.
201201
In the dialog select the "Programs" tab and select Vim in the "HTML editor"
202-
choice. If it's not there than installing didn't work properly.
202+
choice. If it's not there then installing didn't work properly.
203203

204204
Doing this manually can be done with this script:
205205

runtime/doc/help.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*help.txt* For Vim version 8.2. Last change: 2019 Jul 21
1+
*help.txt* For Vim version 8.2. Last change: 2020 Apr 05
22

33
VIM - main help file
44
k
@@ -31,7 +31,7 @@ Get specific help: It is possible to go directly to whatever you want help
3131
help entries for "word".
3232
Or use ":helpgrep word". |:helpgrep|
3333

34-
Getting started: Do the Vim tutor, a 20 minute interactive training for the
34+
Getting started: Do the Vim tutor, a 30-minute interactive course for the
3535
basic commands, see |vimtutor|.
3636
Read the user manual from start to end: |usr_01.txt|
3737

@@ -41,7 +41,7 @@ through the help of many others. See |credits|.
4141
*doc-file-list* *Q_ct*
4242
BASIC:
4343
|quickref| Overview of the most common commands you will use
44-
|tutor| 20 minutes training course for beginners
44+
|tutor| 30-minute interactive course for beginners
4545
|copying| About copyrights
4646
|iccf| Helping poor children in Uganda
4747
|sponsor| Sponsor Vim development, become a registered Vim user
@@ -144,7 +144,7 @@ Special issues ~
144144
|remote.txt| using Vim as a server or client
145145
|term.txt| using different terminals and mice
146146
|terminal.txt| Terminal window support
147-
|popup.txt| popop window support
147+
|popup.txt| popup window support
148148

149149
Programming language support ~
150150
|indent.txt| automatic indenting for C and other languages

runtime/doc/insert.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ CTRL-R CTRL-R {register} *i_CTRL-R_CTRL-R*
154154
you also want to avoid these, use CTRL-R CTRL-O, see below.
155155
The '.' register (last inserted text) is still inserted as
156156
typed.
157+
After this command, the '.' register contains the text from
158+
the register as if it was inserted by typing it.
157159

158160
CTRL-R CTRL-O {register} *i_CTRL-R_CTRL-O*
159161
Insert the contents of a register literally and don't
@@ -163,13 +165,19 @@ CTRL-R CTRL-O {register} *i_CTRL-R_CTRL-O*
163165
Does not replace characters!
164166
The '.' register (last inserted text) is still inserted as
165167
typed.
168+
After this command, the '.' register contains the command
169+
typed and not the text. I.e., the literals "^R^O" and not the
170+
text from the register.
166171

167172
CTRL-R CTRL-P {register} *i_CTRL-R_CTRL-P*
168173
Insert the contents of a register literally and fix the
169174
indent, like |[<MiddleMouse>|.
170175
Does not replace characters!
171176
The '.' register (last inserted text) is still inserted as
172177
typed.
178+
After this command, the '.' register contains the command
179+
typed and not the text. I.e., the literals "^R^P" and not the
180+
text from the register.
173181

174182
*i_CTRL-T*
175183
CTRL-T Insert one shiftwidth of indent at the start of the current

runtime/doc/options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.2. Last change: 2020 Mar 02
1+
*options.txt* For Vim version 8.2. Last change: 2020 Apr 10
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -7957,7 +7957,7 @@ A jump table for the options with a short description can be found at |Q_op|.
79577957
- VIM the server name |v:servername| or "VIM"
79587958
Only works if the terminal supports setting window titles
79597959
(currently Amiga console, Win32 console, all GUI versions and
7960-
terminals with a non- empty 't_ts' option - these are Unix xterm and
7960+
terminals with a non-empty 't_ts' option - these are Unix xterm and
79617961
iris-ansi by default, where 't_ts' is taken from the builtin termcap).
79627962
*X11*
79637963
When Vim was compiled with HAVE_X11 defined, the original title will

runtime/doc/os_beos.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ and merge it back in.
138138

139139
6. The $VIM directory *beos-vimdir*
140140

141-
$VIM is the symbolic name for the place where Vims support files are stored.
141+
$VIM is the symbolic name for the place where Vim's support files are stored.
142142
The default value for $VIM is set at compile time and can be determined with >
143143
144144
:version

runtime/doc/os_haiku.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Stuff that does not work yet:
8888

8989
4. The $VIM directory *haiku-vimdir*
9090

91-
$VIM is the symbolic name for the place where Vims support files are stored.
91+
$VIM is the symbolic name for the place where Vim's support files are stored.
9292
The default value for $VIM is set at compile time and can be determined with >
9393
9494
:version

0 commit comments

Comments
 (0)