Skip to content

Commit 54e742c

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 8c4e43c + 98989a0 commit 54e742c

87 files changed

Lines changed: 2072 additions & 720 deletions

Some content is hidden

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

.github/CODEOWNERS_vim

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ runtime/compiler/dartdevc.vim @dkearns
3131
runtime/compiler/dartdoc.vim @dkearns
3232
runtime/compiler/dartfmt.vim @dkearns
3333
runtime/compiler/eruby.vim @dkearns
34+
runtime/compiler/fbc.vim @dkearns
3435
runtime/compiler/gawk.vim @dkearns
3536
runtime/compiler/gjs.vim @dkearns
3637
runtime/compiler/haml.vim @tpope
@@ -66,12 +67,14 @@ runtime/doc/pi_tar.txt @cecamp
6667
runtime/doc/pi_vimball.txt @cecamp
6768
runtime/doc/pi_zip.txt @cecamp
6869
runtime/ftplugin/awk.vim @dkearns
70+
runtime/ftplugin/basic.vim @dkearns
6971
runtime/ftplugin/bst.vim @tpope
7072
runtime/ftplugin/cfg.vim @chrisbra
7173
runtime/ftplugin/css.vim @dkearns
7274
runtime/ftplugin/cucumber.vim @tpope
7375
runtime/ftplugin/eiffel.vim @dkearns
7476
runtime/ftplugin/eruby.vim @tpope @dkearns
77+
runtime/ftplugin/freebasic.vim @dkearns
7578
runtime/ftplugin/git.vim @tpope
7679
runtime/ftplugin/gitcommit.vim @tpope
7780
runtime/ftplugin/gitconfig.vim @tpope
@@ -93,6 +96,7 @@ runtime/ftplugin/ruby.vim @tpope @dkearns
9396
runtime/ftplugin/sass.vim @tpope
9497
runtime/ftplugin/scss.vim @tpope
9598
runtime/ftplugin/spec.vim @ignatenkobrain
99+
runtime/ftplugin/tidy.vim @dkearns
96100
runtime/ftplugin/tmux.vim @ericpruitt
97101
runtime/ftplugin/typescript.vim @dkearns
98102
runtime/ftplugin/typescriptreact.vim @dkearns
@@ -127,6 +131,7 @@ runtime/syntax/amiga.vim @cecamp
127131
runtime/syntax/asm.vim @dkearns
128132
runtime/syntax/asmh8300.vim @dkearns
129133
runtime/syntax/awk.vim @dkearns
134+
runtime/syntax/basic.vim @dkearns
130135
runtime/syntax/bst.vim @tpope
131136
runtime/syntax/cabal.vim @coot
132137
runtime/syntax/cabalconfig.vim @coot

runtime/compiler/fbc.vim

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
" Vim compiler file
2+
" Compiler: FreeBASIC Compiler
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2015 Jan 10
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "fbc"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=fbc
19+
CompilerSet errorformat=%-G%.%#Too\ many\ errors\\,\ exiting,
20+
\%f(%l)\ %tarning\ %n(%\\d%\\+):\ %m,
21+
\%E%f(%l)\ error\ %n:\ %m,
22+
\%-Z%p^,
23+
\%-C%.%#,
24+
\%-G%.%#
25+
26+
let &cpo = s:cpo_save
27+
unlet s:cpo_save

runtime/compiler/tidy.vim

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
22
" Compiler: HTML Tidy
33
" Maintainer: Doug Kearns <[email protected]>
4-
" Last Change: 2016 Apr 21
4+
" Last Change: 2020 Sep 4
55

66
if exists("current_compiler")
77
finish
@@ -12,8 +12,15 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
1212
command -nargs=* CompilerSet setlocal <args>
1313
endif
1414

15-
CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
15+
let s:cpo_save = &cpo
16+
set cpo&vim
1617

17-
" foo.html:8:1: Warning: inserting missing 'foobar' element
18-
" foo.html:9:2: Error: <foobar> is not recognized!
19-
CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
18+
CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes
19+
CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m,
20+
\%f:%l:%c:\ %tarning:\ %m,
21+
\%f:%l:%c:\ %tnfo:\ %m,
22+
\%f:%l:%c:\ %m,
23+
\%-G%.%#
24+
25+
let &cpo = s:cpo_save
26+
unlet s:cpo_save

runtime/doc/change.txt

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 8.2. Last change: 2020 Nov 21
1+
*change.txt* For Vim version 8.2. Last change: 2021 Jan 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1631,24 +1631,31 @@ default setting is "tcq". You can separate the option letters with commas for
16311631
readability.
16321632

16331633
letter meaning when present in 'formatoptions' ~
1634-
1634+
*fo-t*
16351635
t Auto-wrap text using textwidth
1636+
*fo-c*
16361637
c Auto-wrap comments using textwidth, inserting the current comment
16371638
leader automatically.
1639+
*fo-r*
16381640
r Automatically insert the current comment leader after hitting
16391641
<Enter> in Insert mode.
1642+
*fo-o*
16401643
o Automatically insert the current comment leader after hitting 'o' or
16411644
'O' in Normal mode.
1645+
*fo-q*
16421646
q Allow formatting of comments with "gq".
16431647
Note that formatting will not change blank lines or lines containing
16441648
only the comment leader. A new paragraph starts after such a line,
16451649
or when the comment leader changes.
1650+
*fo-w*
16461651
w Trailing white space indicates a paragraph continues in the next line.
16471652
A line that ends in a non-white character ends a paragraph.
1653+
*fo-a*
16481654
a Automatic formatting of paragraphs. Every time text is inserted or
16491655
deleted the paragraph will be reformatted. See |auto-format|.
16501656
When the 'c' flag is present this only happens for recognized
16511657
comments.
1658+
*fo-n*
16521659
n When formatting text, recognize numbered lists. This actually uses
16531660
the 'formatlistpat' option, thus any kind of list can be used. The
16541661
indent of the text after the number is used for the next line. The
@@ -1659,6 +1666,7 @@ n When formatting text, recognize numbered lists. This actually uses
16591666
1. the first item
16601667
wraps
16611668
2. the second item
1669+
< *fo-2*
16621670
2 When formatting text, use the indent of the second line of a paragraph
16631671
for the rest of the paragraph, instead of the indent of the first
16641672
line. This supports paragraphs in which the first line has a
@@ -1668,36 +1676,46 @@ n When formatting text, recognize numbered lists. This actually uses
16681676
second line of the same paragraph
16691677
third line.
16701678
< This also works inside comments, ignoring the comment leader.
1679+
*fo-v*
16711680
v Vi-compatible auto-wrapping in insert mode: Only break a line at a
16721681
blank that you have entered during the current insert command. (Note:
16731682
this is not 100% Vi compatible. Vi has some "unexpected features" or
16741683
bugs in this area. It uses the screen column instead of the line
16751684
column.)
1685+
*fo-b*
16761686
b Like 'v', but only auto-wrap if you enter a blank at or before
16771687
the wrap margin. If the line was longer than 'textwidth' when you
16781688
started the insert, or you do not enter a blank in the insert before
16791689
reaching 'textwidth', Vim does not perform auto-wrapping.
1690+
*fo-l*
16801691
l Long lines are not broken in insert mode: When a line was longer than
16811692
'textwidth' when the insert command started, Vim does not
16821693
automatically format it.
1694+
*fo-m*
16831695
m Also break at a multibyte character above 255. This is useful for
16841696
Asian text where every character is a word on its own.
1697+
*fo-M*
16851698
M When joining lines, don't insert a space before or after a multibyte
16861699
character. Overrules the 'B' flag.
1700+
*fo-B*
16871701
B When joining lines, don't insert a space between two multibyte
16881702
characters. Overruled by the 'M' flag.
1703+
*fo-1*
16891704
1 Don't break a line after a one-letter word. It's broken before it
16901705
instead (if possible).
1706+
*fo-]*
16911707
] Respect textwidth rigorously. With this flag set, no line can be
16921708
longer than textwidth, unless line-break-prohibition rules make this
16931709
impossible. Mainly for CJK scripts and works only if 'encoding' is
16941710
"utf-8".
1711+
*fo-j*
16951712
j Where it makes sense, remove a comment leader when joining lines. For
16961713
example, joining:
16971714
int i; // the index ~
16981715
// in the list ~
16991716
Becomes:
17001717
int i; // the index in the list ~
1718+
*fo-p*
17011719
p Don't break lines at single spaces that follow periods. This is
17021720
intended to complement 'joinspaces' and |cpo-J|, for prose with
17031721
sentences separated by two spaces. For example, with 'textwidth' set

runtime/doc/eval.txt

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.2. Last change: 2021 Jan 13
1+
*eval.txt* For Vim version 8.2. Last change: 2021 Jan 22
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2082,6 +2082,12 @@ v:null An empty String. Used to put "null" in JSON. See
20822082
That is so that eval() can parse the string back to the same
20832083
value. Read-only.
20842084

2085+
*v:numbermax* *numbermax-variable*
2086+
v:numbermax Maximum value of a number.
2087+
2088+
*v:numbermin* *numbermin-variable*
2089+
v:numbermin Minimum value of a number (negative)
2090+
20852091
*v:numbersize* *numbersize-variable*
20862092
v:numbersize Number of bits in a Number. This is normally 64, but on some
20872093
systems it may be 32.
@@ -4096,8 +4102,9 @@ delete({fname} [, {flags}]) *delete()*
40964102

40974103
A symbolic link itself is deleted, not what it points to.
40984104

4099-
The result is a Number, which is 0 if the delete operation was
4100-
successful and -1 when the deletion failed or partly failed.
4105+
The result is a Number, which is 0/false if the delete
4106+
operation was successful and -1/true when the deletion failed
4107+
or partly failed.
41014108

41024109
Use |remove()| to delete an item from a |List|.
41034110
To delete a line from the buffer use |:delete| or
@@ -6234,8 +6241,8 @@ has({feature} [, {check}])
62346241

62356242

62366243
has_key({dict}, {key}) *has_key()*
6237-
The result is a Number, which is 1 if |Dictionary| {dict} has
6238-
an entry with key {key}. Zero otherwise.
6244+
The result is a Number, which is TRUE if |Dictionary| {dict}
6245+
has an entry with key {key}. FALSE otherwise.
62396246

62406247
Can also be used as a |method|: >
62416248
mydict->has_key(key)
@@ -6278,16 +6285,16 @@ haslocaldir([{winnr} [, {tabnr}]]) *haslocaldir()*
62786285
GetWinnr()->haslocaldir()
62796286

62806287
hasmapto({what} [, {mode} [, {abbr}]]) *hasmapto()*
6281-
The result is a Number, which is 1 if there is a mapping that
6282-
contains {what} in somewhere in the rhs (what it is mapped to)
6283-
and this mapping exists in one of the modes indicated by
6284-
{mode}.
6288+
The result is a Number, which is TRUE if there is a mapping
6289+
that contains {what} in somewhere in the rhs (what it is
6290+
mapped to) and this mapping exists in one of the modes
6291+
indicated by {mode}.
62856292
When {abbr} is there and it is |TRUE| use abbreviations
62866293
instead of mappings. Don't forget to specify Insert and/or
62876294
Command-line mode.
62886295
Both the global mappings and the mappings local to the current
62896296
buffer are checked for a match.
6290-
If no matching mapping is found 0 is returned.
6297+
If no matching mapping is found FALSE is returned.
62916298
The following characters are recognized in {mode}:
62926299
n Normal mode
62936300
v Visual and Select mode
@@ -6323,8 +6330,8 @@ histadd({history}, {item}) *histadd()*
63236330
character is sufficient.
63246331
If {item} does already exist in the history, it will be
63256332
shifted to become the newest entry.
6326-
The result is a Number: 1 if the operation was successful,
6327-
otherwise 0 is returned.
6333+
The result is a Number: TRUE if the operation was successful,
6334+
otherwise FALSE is returned.
63286335

63296336
Example: >
63306337
:call histadd("input", strftime("%Y %b %d"))
@@ -6347,8 +6354,8 @@ histdel({history} [, {item}]) *histdel()*
63476354
an index, see |:history-indexing|. The respective entry will
63486355
be removed if it exists.
63496356

6350-
The result is a Number: 1 for a successful operation,
6351-
otherwise 0 is returned.
6357+
The result is TRUE for a successful operation, otherwise FALSE
6358+
is returned.
63526359

63536360
Examples:
63546361
Clear expression register history: >
@@ -6400,7 +6407,7 @@ histnr({history}) *histnr()*
64006407
GetHistory()->histnr()
64016408
<
64026409
hlexists({name}) *hlexists()*
6403-
The result is a Number, which is non-zero if a highlight group
6410+
The result is a Number, which is TRUE if a highlight group
64046411
called {name} exists. This is when the group has been
64056412
defined in some way. Not necessarily when highlighting has
64066413
been defined for it, it may also have been used for a syntax
@@ -6573,15 +6580,15 @@ inputrestore() *inputrestore()*
65736580
Restore typeahead that was saved with a previous |inputsave()|.
65746581
Should be called the same number of times inputsave() is
65756582
called. Calling it more often is harmless though.
6576-
Returns 1 when there is nothing to restore, 0 otherwise.
6583+
Returns TRUE when there is nothing to restore, FALSE otherwise.
65776584

65786585
inputsave() *inputsave()*
65796586
Preserve typeahead (also from mappings) and clear it, so that
65806587
a following prompt gets input from the user. Should be
65816588
followed by a matching inputrestore() after the prompt. Can
65826589
be used several times, in which case there must be just as
65836590
many inputrestore() calls.
6584-
Returns 1 when out of memory, 0 otherwise.
6591+
Returns TRUE when out of memory, FALSE otherwise.
65856592

65866593
inputsecret({prompt} [, {text}]) *inputsecret()*
65876594
This function acts much like the |input()| function with but
@@ -7057,7 +7064,7 @@ listener_flush([{buf}]) *listener_flush()*
70577064

70587065
listener_remove({id}) *listener_remove()*
70597066
Remove a listener previously added with listener_add().
7060-
Returns zero when {id} could not be found, one when {id} was
7067+
Returns FALSE when {id} could not be found, TRUE when {id} was
70617068
removed.
70627069

70637070
Can also be used as a |method|: >
@@ -7740,8 +7747,8 @@ mkdir({name} [, {path} [, {prot}]])
77407747
flag is passed (since patch 8.0.1708). However, without the
77417748
"p" option the call will fail.
77427749

7743-
The function result is a Number, which is 1 if the call was
7744-
successful or 0 if the directory creation failed or partly
7750+
The function result is a Number, which is TRUE if the call was
7751+
successful or FALSE if the directory creation failed or partly
77457752
failed.
77467753

77477754
Not available on all systems. To check use: >
@@ -9217,6 +9224,7 @@ server2client({clientid}, {string}) *server2client()*
92179224
Send a reply string to {clientid}. The most recent {clientid}
92189225
that sent a string can be retrieved with expand("<client>").
92199226
{only available when compiled with the |+clientserver| feature}
9227+
Returns zero for success, -1 for failure.
92209228
Note:
92219229
This id has to be stored before the next command can be
92229230
received. I.e. before returning from the received command and
@@ -9354,8 +9362,8 @@ setcmdpos({pos}) *setcmdpos()*
93549362
before inserting the resulting text.
93559363
When the number is too big the cursor is put at the end of the
93569364
line. A number smaller than one has undefined results.
9357-
Returns 0 when successful, 1 when not editing the command
9358-
line.
9365+
Returns FALSE when successful, TRUE when not editing the
9366+
command line.
93599367

93609368
Can also be used as a |method|: >
93619369
GetPos()->setcmdpos()
@@ -9414,8 +9422,8 @@ setline({lnum}, {text}) *setline()*
94149422
When {lnum} is just below the last line the {text} will be
94159423
added below the last line.
94169424

9417-
If this succeeds, 0 is returned. If this fails (most likely
9418-
because {lnum} is invalid) 1 is returned.
9425+
If this succeeds, FALSE is returned. If this fails (most likely
9426+
because {lnum} is invalid) TRUE is returned.
94199427

94209428
Example: >
94219429
:call setline(5, strftime("%c"))
@@ -11390,7 +11398,7 @@ win_gettype([{nr}]) *win_gettype()*
1139011398
win_gotoid({expr}) *win_gotoid()*
1139111399
Go to window with ID {expr}. This may also change the current
1139211400
tabpage.
11393-
Return 1 if successful, 0 if the window cannot be found.
11401+
Return TRUE if successful, FALSE if the window cannot be found.
1139411402

1139511403
Can also be used as a |method|: >
1139611404
GetWinid()->win_gotoid()

runtime/doc/filetype.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*filetype.txt* For Vim version 8.2. Last change: 2020 Sep 28
1+
*filetype.txt* For Vim version 8.2. Last change: 2021 Jan 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -147,6 +147,7 @@ can be used to overrule the filetype used for certain extensions:
147147
*.w g:filetype_w |ft-cweb-syntax|
148148
*.i g:filetype_i |ft-progress-syntax|
149149
*.p g:filetype_p |ft-pascal-syntax|
150+
*.pp g:filetype_pp |ft-pascal-syntax|
150151
*.sh g:bash_is_sh |ft-sh-syntax|
151152
*.tex g:tex_flavor |ft-tex-plugin|
152153

runtime/doc/index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*index.txt* For Vim version 8.2. Last change: 2020 Oct 05
1+
*index.txt* For Vim version 8.2. Last change: 2021 Jan 15
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3288,7 +3288,7 @@ A jump table for the options with a short description can be found at |Q_op|.
32883288
See the 'endofline' option.
32893289

32903290
*'fkmap'* *'fk'* *'nofkmap'* *'nofk'*
3291-
'fkmap' 'fk' boolean (default off) *E198*
3291+
'fkmap' 'fk' boolean (default off)
32923292
global
32933293
{only available when compiled with the |+rightleft|
32943294
feature}
@@ -5361,7 +5361,7 @@ A jump table for the options with a short description can be found at |Q_op|.
53615361
NOTE: This option is set to the Vi default value when 'compatible' is
53625362
set and to the Vim default value when 'compatible' is reset.
53635363

5364-
*'mouse'* *E538*
5364+
*'mouse'*
53655365
'mouse' string (default "", "a" for GUI and Win32,
53665366
set to "a" or "nvi" in |defaults.vim|)
53675367
global

0 commit comments

Comments
 (0)