Skip to content

Commit f3e88fa

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 9ba647c + 56858e4 commit f3e88fa

Some content is hidden

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

44 files changed

+732
-185
lines changed

runtime/autoload/csscomplete.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
55
" Maintainer: Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
66
" Original Author: Mikolaj Machowski ( mikmach AT wp DOT pl )
7-
" Last Change: 2018 Jul 02
7+
" Last Change: 2021 Sep 21
88

99
let s:values = split("all additive-symbols align-content align-items align-self animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size block-size border border-block-end border-block-end-color border-block-end-style border-block-end-width border-block-start border-block-start-color border-block-start-style border-block-start-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-inline-end border-inline-end-color border-inline-end-style border-inline-end-width border-inline-start border-inline-start-color border-inline-start-style border-inline-start-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side clear clip clip-path color columns column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width content counter-increment counter-reset cue cue-before cue-after cursor direction display empty-cells fallback filter flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float font font-family font-feature-settings font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-position grid-auto-rows grid-column grid-column-start grid-column-end grid-row grid-row-start grid-row-end grid-template grid-template-areas grid-template-rows grid-template-columns height hyphens image-rendering image-resolution image-orientation ime-mode inline-size isolation justify-content left letter-spacing line-break line-height list-style list-style-image list-style-position list-style-type margin margin-block-end margin-block-start margin-bottom margin-inline-end margin-inline-start margin-left margin-right margin-top marks mask mask-type max-block-size max-height max-inline-size max-width max-zoom min-block-size min-height min-inline-size min-width min-zoom mix-blend-mode negative object-fit object-position offset-block-end offset-block-start offset-inline-end offset-inline-start opacity order orientation orphans outline outline-color outline-offset outline-style outline-width overflow overflow-wrap overflow-x overflow-y pad padding padding-block-end padding-block-start padding-bottom padding-inline-end padding-inline-start padding-left padding-right padding-top page-break-after page-break-before page-break-inside pause-before pause-after pause perspective perspective-origin pointer-events position prefix quotes range resize rest rest-before rest-after right ruby-align ruby-merge ruby-position scroll-behavior scroll-snap-coordinate scroll-snap-destination scroll-snap-points-x scroll-snap-points-y scroll-snap-type scroll-snap-type-x scroll-snap-type-y shape-image-threshold shape-margin shape-outside speak speak-as suffix symbols system table-layout tab-size text-align text-align-last text-combine-upright text-decoration text-decoration-color text-decoration-line text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-indent text-orientation text-overflow text-rendering text-shadow text-transform text-underline-position top touch-action transform transform-box transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi unicode-range user-zoom vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-rate voice-range voice-stress voice-volume white-space widows width will-change word-break word-spacing word-wrap writing-mode z-index zoom")
1010

@@ -38,12 +38,12 @@ function! csscomplete#CompleteCSS(findstart, base)
3838
if exists("b:compl_context")
3939
let line = getline('.')
4040
let compl_begin = col('.') - 2
41-
let after = line[compl_begin:]
41+
let b:after = line[compl_begin:]
4242
let line = b:compl_context
4343
unlet! b:compl_context
4444
else
4545
let line = a:base
46-
let after = ''
46+
let b:after = ''
4747
endif
4848

4949
let res = []

runtime/doc/eval.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.2. Last change: 2021 Sep 08
1+
*eval.txt* For Vim version 8.2. Last change: 2021 Sep 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -658,7 +658,7 @@ It is not necessary to use the "dict" attribute for a numbered function.
658658

659659
If you get an error for a numbered function, you can find out what it is with
660660
a trick. Assuming the function is 42, the command is: >
661-
:function {42}
661+
:function g:42
662662

663663

664664
Functions for Dictionaries ~
@@ -6152,6 +6152,7 @@ getreg([{regname} [, 1 [, {list}]]]) *getreg()*
61526152
(see |NL-used-for-Nul|).
61536153
When the register was not set an empty list is returned.
61546154

6155+
If {regname} is "", the unnamed register '"' is used.
61556156
If {regname} is not specified, |v:register| is used.
61566157
In |Vim9-script| {regname} must be one character.
61576158

@@ -6179,6 +6180,7 @@ getreginfo([{regname}]) *getreginfo()*
61796180

61806181
The {regname} argument is a string. If {regname} is invalid
61816182
or not set, an empty Dictionary will be returned.
6183+
If {regname} is "" or "@", the unnamed register '"' is used.
61826184
If {regname} is not specified, |v:register| is used.
61836185
The returned Dictionary can be passed to |setreg()|.
61846186
In |Vim9-script| {regname} must be one character.
@@ -6194,8 +6196,9 @@ getregtype([{regname}]) *getregtype()*
61946196
"<CTRL-V>{width}" for |blockwise-visual| text
61956197
"" for an empty or unknown register
61966198
<CTRL-V> is one character with value 0x16.
6197-
The {regname} argument is a string. If {regname} is not
6198-
specified, |v:register| is used.
6199+
The {regname} argument is a string. If {regname} is "", the
6200+
unnamed register '"' is used. If {regname} is not specified,
6201+
|v:register| is used.
61996202
In |Vim9-script| {regname} must be one character.
62006203

62016204
Can also be used as a |method|: >
@@ -12090,6 +12093,7 @@ There are three types of features:
1209012093
1. Features that are only supported when they have been enabled when Vim
1209112094
was compiled |+feature-list|. Example: >
1209212095
:if has("cindent")
12096+
< *gui_running*
1209312097
2. Features that are only supported when certain conditions have been met.
1209412098
Example: >
1209512099
:if has("gui_running")

runtime/doc/filetype.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,14 @@ One command, :DiffGitCached, is provided to show a diff of the current commit
545545
in the preview window. It is equivalent to calling "git diff --cached" plus
546546
any arguments given to the command.
547547

548+
GPROF
549+
550+
The gprof filetype plugin defines a mapping <C-]> to jump from a function
551+
entry in the gprof flat profile or from a function entry in the call graph
552+
to the details of that function in the call graph.
553+
554+
The mapping can be disabled with: >
555+
let g:no_gprof_maps = 1
548556
549557
MAIL *ft-mail-plugin*
550558

runtime/doc/map.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*map.txt* For Vim version 8.2. Last change: 2021 Aug 05
1+
*map.txt* For Vim version 8.2. Last change: 2021 Sep 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar

runtime/doc/options.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.2. Last change: 2021 Sep 06
1+
*options.txt* For Vim version 8.2. Last change: 2021 Sep 21
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5078,7 +5078,8 @@ A jump table for the options with a short description can be found at |Q_op|.
50785078
:set lcs=tab:>-,eol:<,nbsp:%
50795079
:set lcs=extends:>,precedes:<
50805080
< The "NonText" highlighting will be used for "eol", "extends" and
5081-
"precedes". "SpecialKey" for "nbsp", "space", "tab" and "trail".
5081+
"precedes". "SpecialKey" will be used for "tab", "nbsp", "space",
5082+
"multispace", "lead" and "trail".
50825083
|hl-NonText| |hl-SpecialKey|
50835084

50845085
*'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'*
@@ -8924,8 +8925,9 @@ A jump table for the options with a short description can be found at |Q_op|.
89248925
More info here: |cmdline-completion|.
89258926
The character is not recognized when used inside a macro. See
89268927
'wildcharm' for that.
8928+
Some keys will not work, such as CTRL-C, <CR> and Enter.
89278929
Although 'wc' is a number option, you can set it to a special key: >
8928-
:set wc=<Esc>
8930+
:set wc=<Tab>
89298931
< NOTE: This option is set to the Vi default value when 'compatible' is
89308932
set and to the Vim default value when 'compatible' is reset.
89318933

runtime/doc/sign.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ sign_jump({id}, {group}, {buf})
520520
{buf} and position the cursor at sign {id} in group {group}.
521521
This is similar to the |:sign-jump| command.
522522

523+
If {group} is an empty string, then the global group is used.
523524
For the use of {buf}, see |bufname()|.
524525

525526
Returns the line number of the sign. Returns -1 if the

runtime/doc/tags

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,6 +4043,8 @@ E123 eval.txt /*E123*
40434043
E1231 map.txt /*E1231*
40444044
E1232 eval.txt /*E1232*
40454045
E1233 eval.txt /*E1233*
4046+
E1237 map.txt /*E1237*
4047+
E1239 eval.txt /*E1239*
40464048
E124 eval.txt /*E124*
40474049
E125 eval.txt /*E125*
40484050
E126 eval.txt /*E126*
@@ -5096,6 +5098,7 @@ Macintosh os_mac.txt /*Macintosh*
50965098
Mark motion.txt /*Mark*
50975099
MenuPopup autocmd.txt /*MenuPopup*
50985100
MiNT os_mint.txt /*MiNT*
5101+
ModeChanged autocmd.txt /*ModeChanged*
50995102
Moolenaar intro.txt /*Moolenaar*
51005103
MorphOS os_amiga.txt /*MorphOS*
51015104
Motif gui_x11.txt /*Motif*
@@ -5638,10 +5641,12 @@ beval_winnr-variable eval.txt /*beval_winnr-variable*
56385641
binary-number eval.txt /*binary-number*
56395642
bitwise-function usr_41.txt /*bitwise-function*
56405643
blob eval.txt /*blob*
5644+
blob-functions usr_41.txt /*blob-functions*
56415645
blob-identity eval.txt /*blob-identity*
56425646
blob-index eval.txt /*blob-index*
56435647
blob-literal eval.txt /*blob-literal*
56445648
blob-modification eval.txt /*blob-modification*
5649+
blob2list() eval.txt /*blob2list()*
56455650
blockwise-examples visual.txt /*blockwise-examples*
56465651
blockwise-operators visual.txt /*blockwise-operators*
56475652
blockwise-register change.txt /*blockwise-register*
@@ -7293,6 +7298,7 @@ gui-x11-start gui_x11.txt /*gui-x11-start*
72937298
gui-x11-various gui_x11.txt /*gui-x11-various*
72947299
gui.txt gui.txt /*gui.txt*
72957300
gui_mac.txt gui_mac.txt /*gui_mac.txt*
7301+
gui_running eval.txt /*gui_running*
72967302
gui_w32.txt gui_w32.txt /*gui_w32.txt*
72977303
gui_x11.txt gui_x11.txt /*gui_x11.txt*
72987304
guifontwide_gtk gui.txt /*guifontwide_gtk*
@@ -7795,6 +7801,7 @@ lcs-conceal options.txt /*lcs-conceal*
77957801
lcs-eol options.txt /*lcs-eol*
77967802
lcs-extends options.txt /*lcs-extends*
77977803
lcs-lead options.txt /*lcs-lead*
7804+
lcs-multispace options.txt /*lcs-multispace*
77987805
lcs-nbsp options.txt /*lcs-nbsp*
77997806
lcs-precedes options.txt /*lcs-precedes*
78007807
lcs-space options.txt /*lcs-space*
@@ -7829,6 +7836,7 @@ list-identity eval.txt /*list-identity*
78297836
list-index eval.txt /*list-index*
78307837
list-modification eval.txt /*list-modification*
78317838
list-repeat windows.txt /*list-repeat*
7839+
list2blob() eval.txt /*list2blob()*
78327840
list2str() eval.txt /*list2str()*
78337841
listener_add() eval.txt /*listener_add()*
78347842
listener_flush() eval.txt /*listener_flush()*

runtime/doc/textprop.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ prop_add({lnum}, {col}, {props})
160160

161161
Can also be used as a |method|: >
162162
GetLnum()->prop_add(col, props)
163-
163+
<
164164
*prop_add_list()*
165165
prop_add_list({props}, [[{lnum}, {col}, {end-lnum}, {end-col}], ...])
166166
Similar to prop_add(), but attaches a text property at

runtime/doc/todo.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.2. Last change: 2021 Sep 08
1+
*todo.txt* For Vim version 8.2. Last change: 2021 Sep 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,12 +38,14 @@ browser use: https://github.com/vim/vim/issues/1234
3838
*known-bugs*
3939
-------------------- Known bugs and current work -----------------------
4040

41-
:delcommand -buffer should work
41+
Flaky test op Windows:
42+
From test_vim9_script.vim:
43+
Found errors in Test_no_unknown_error_after_error():
44+
command line..script D:/a/vim/vim/src2/testdir/runtest.vim[486]..function RunTheTest[44]..Test_no_unknown_error_after_error line 22: Expected 'E1012:' but got 'E684: list index out of range: 0': so Xdef
4245

4346
Vim9 - Make everything work:
44-
- Disallow using numbered function with "g:123" in Vim9 script? #8760
45-
- use CheckLegacyAndVim9Success(lines) in many more places
4647
- Check TODO items in vim9compile.c and vim9execute.c
48+
- use CheckLegacyAndVim9Success(lines) in many more places
4749
- For builtin functions using tv_get_string*() use check_for_string() to be
4850
more strict about the argument type (not a bool).
4951
done: balloon_()
@@ -366,10 +368,6 @@ autocommands for the buffer lifecycle:
366368
BufIsRenamed (after buffer ID gets another name)
367369
The buffer list and windows are locked, no changes possible
368370

369-
Add a ModeChanged autocommand that has an argument indicating the old and new
370-
mode, as what's returned from mode(). Also used for switching Terminal mode.
371-
#8360, #7863, #7363
372-
373371
Matchparen doesn't remove highlight after undo. (#7054)
374372
Is OK when syntax HL is active.
375373

@@ -4845,7 +4843,6 @@ Autocommands:
48454843
command used dos fileformat. Same for 'fileencoding'.
48464844
- Add events to autocommands:
48474845
Error - When an error happens
4848-
ModeChange - after changing mode (before waiting for a char)
48494846
VimLeaveCheck - Before Vim decides to exit, so that it can be cancelled
48504847
when exiting isn't a good idea.
48514848
CursorHoldC - CursorHold while command-line editing

runtime/doc/usr_41.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_41.txt* For Vim version 8.2. Last change: 2021 Aug 08
1+
*usr_41.txt* For Vim version 8.2. Last change: 2021 Sep 10
22

33
VIM USER MANUAL - by Bram Moolenaar
44

0 commit comments

Comments
 (0)