Skip to content

Commit 589edb3

Browse files
committed
Updte runtime files
1 parent 56ebbab commit 589edb3

11 files changed

Lines changed: 168 additions & 116 deletions

File tree

runtime/doc/autocmd.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*autocmd.txt* For Vim version 8.1. Last change: 2019 Jun 26
1+
*autocmd.txt* For Vim version 8.1. Last change: 2019 Sep 16
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -581,7 +581,7 @@ ColorScheme After loading a color scheme. |:colorscheme|
581581
ColorSchemePre Before loading a color scheme. |:colorscheme|
582582
Useful to setup removing things added by a
583583
color scheme, before another one is loaded.
584-
CompleteChanged *CompleteChanged*
584+
CompleteChanged *CompleteChanged*
585585
After each time the Insert mode completion
586586
menu changed. Not fired on popup menu hide,
587587
use |CompleteDone| for that. Never triggered
@@ -1117,8 +1117,8 @@ TextYankPost After text has been yanked or deleted in the
11171117
current buffer. The following values of
11181118
|v:event| can be used to determine the operation
11191119
that triggered this autocmd:
1120-
operator The operation performed.
1121-
regcontents Text that was stored in the
1120+
operator The operation performed.
1121+
regcontents Text that was stored in the
11221122
register, as a list of lines,
11231123
like with: >
11241124
getreg(r, 1, 1)
@@ -1154,7 +1154,7 @@ VimEnter After doing all the startup stuff, including
11541154
if v:vim_did_enter
11551155
call s:init()
11561156
else
1157-
au VimEnter * call s:init()
1157+
au VimEnter * call s:init()
11581158
endif
11591159
< *VimLeave*
11601160
VimLeave Before exiting Vim, just after writing the

runtime/doc/eval.txt

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.1. Last change: 2019 Sep 15
1+
*eval.txt* For Vim version 8.1. Last change: 2019 Sep 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2595,7 +2595,7 @@ or({expr}, {expr}) Number bitwise OR
25952595
pathshorten({expr}) String shorten directory names in a path
25962596
perleval({expr}) any evaluate |Perl| expression
25972597
popup_atcursor({what}, {options}) Number create popup window near the cursor
2598-
popup_beval({what}, {options}) Number create popup window for 'ballooneval'
2598+
popup_beval({what}, {options}) Number create popup window for 'ballooneval'
25992599
popup_clear() none close all popup windows
26002600
popup_close({id} [, {result}]) none close popup window {id}
26012601
popup_create({what}, {options}) Number create a popup window
@@ -9048,31 +9048,36 @@ state([{what}]) *state()*
90489048
current state. Mostly useful in callbacks that want to do
90499049
work that may not always be safe. Roughly this works like:
90509050
- callback uses state() to check if work is safe to do.
9051-
If yes, then do it right away.
9052-
Otherwise add to work queue and add SafeState and/or
9053-
SafeStateAgain autocommand.
9054-
- When SafeState or SafeStateAgain is triggered, check with
9055-
state() if the work can be done now, and if yes remove it
9056-
from the queue and execute.
9051+
Yes: then do it right away.
9052+
No: add to work queue and add a |SafeState| and/or
9053+
|SafeStateAgain| autocommand (|SafeState| triggers at
9054+
toplevel, |SafeStateAgain| triggers after handling
9055+
messages and callbacks).
9056+
- When SafeState or SafeStateAgain is triggered and executes
9057+
your autocommand, check with `state()` if the work can be
9058+
done now, and if yes remove it from the queue and execute.
9059+
Remove the autocommand if the queue is now empty.
90579060
Also see |mode()|.
90589061

90599062
When {what} is given only characters in this string will be
90609063
added. E.g, this checks if the screen has scrolled: >
9061-
if state('s') != ''
9064+
if state('s') == ''
9065+
" screen has not scrolled
90629066
<
90639067
These characters indicate the state, generally indicating that
90649068
something is busy:
9065-
m halfway a mapping, :normal command, feedkeys() or
9066-
stuffed command
9067-
o operator pending or waiting for a command argument
9068-
a Insert mode autocomplete active
9069-
x executing an autocommand
9070-
w blocked on waiting, e.g. ch_evalexpr() and
9071-
ch_read(), ch_readraw() when reading json.
9072-
S not triggering SafeState or SafeStateAgain
9073-
c callback invoked, including timer (repeats for
9074-
recursiveness up to "ccc")
9075-
s screen has scrolled for messages
9069+
m halfway a mapping, :normal command, feedkeys() or
9070+
stuffed command
9071+
o operator pending or waiting for a command argument,
9072+
e.g. after |f|
9073+
a Insert mode autocomplete active
9074+
x executing an autocommand
9075+
w blocked on waiting, e.g. ch_evalexpr() and
9076+
ch_read(), ch_readraw() when reading json.
9077+
S not triggering SafeState or SafeStateAgain
9078+
c callback invoked, including timer (repeats for
9079+
recursiveness up to "ccc")
9080+
s screen has scrolled for messages
90769081

90779082
str2float({expr}) *str2float()*
90789083
Convert String {expr} to a Float. This mostly works the same

runtime/doc/options.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.1. Last change: 2019 Sep 09
1+
*options.txt* For Vim version 8.1. Last change: 2019 Sep 18
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -8565,8 +8565,8 @@ A jump table for the options with a short description can be found at |Q_op|.
85658565
":map <BS> X" to make backspace delete the character in front of the
85668566
cursor.
85678567
When 'l' is included and it is used after an operator at the end of a
8568-
line then it will not move to the next line. This makes "dl", "cl",
8569-
"yl" etc. work normally.
8568+
line (not an empty line) then it will not move to the next line. This
8569+
makes "dl", "cl", "yl" etc. work normally.
85708570
NOTE: This option is set to the Vi default value when 'compatible' is
85718571
set and to the Vim default value when 'compatible' is reset.
85728572

runtime/doc/repeat.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*repeat.txt* For Vim version 8.1. Last change: 2019 Jun 14
1+
*repeat.txt* For Vim version 8.1. Last change: 2019 Sep 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -219,10 +219,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
219219

220220
When {file} contains wildcards it is expanded to all
221221
matching files. Example: >
222-
:runtime! plugin/*.vim
222+
:runtime! plugin/**/*.vim
223223
< This is what Vim uses to load the plugin files when
224224
starting up. This similar command: >
225-
:runtime plugin/*.vim
225+
:runtime plugin/**/*.vim
226226
< would source the first file only.
227227

228228
When 'verbose' is one or higher, there is a message

runtime/doc/syntax.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 8.1. Last change: 2019 Jul 15
1+
*syntax.txt* For Vim version 8.1. Last change: 2019 Sep 19
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1923,6 +1923,16 @@ displayed line. The default value is 10. The disadvantage of using a larger
19231923
number is that redrawing can become slow.
19241924

19251925

1926+
JSON *json.vim* *ft-json-syntax*
1927+
1928+
The json syntax file provides syntax highlighting with conceal support by
1929+
default. To disable concealment: >
1930+
let g:vim_json_conceal = 0
1931+
1932+
To disable syntax highlighting of errors: >
1933+
let g:vim_json_warnings = 0
1934+
1935+
19261936
LACE *lace.vim* *ft-lace-syntax*
19271937

19281938
Lace (Language for Assembly of Classes in Eiffel) is case insensitive, but the

runtime/doc/tags

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX*
312312
'go-a' options.txt /*'go-a'*
313313
'go-b' options.txt /*'go-b'*
314314
'go-c' options.txt /*'go-c'*
315+
'go-d' options.txt /*'go-d'*
315316
'go-e' options.txt /*'go-e'*
316317
'go-f' options.txt /*'go-f'*
317318
'go-g' options.txt /*'go-g'*
@@ -5003,6 +5004,8 @@ S change.txt /*S*
50035004
SHELL starting.txt /*SHELL*
50045005
SQLGetType ft_sql.txt /*SQLGetType*
50055006
SQLSetType ft_sql.txt /*SQLSetType*
5007+
SafeState autocmd.txt /*SafeState*
5008+
SafeStateAgain autocmd.txt /*SafeStateAgain*
50065009
Select visual.txt /*Select*
50075010
Select-mode visual.txt /*Select-mode*
50085011
Select-mode-mapping visual.txt /*Select-mode-mapping*
@@ -6425,6 +6428,7 @@ ft-ia64-syntax syntax.txt /*ft-ia64-syntax*
64256428
ft-inform-syntax syntax.txt /*ft-inform-syntax*
64266429
ft-java-syntax syntax.txt /*ft-java-syntax*
64276430
ft-javascript-omni insert.txt /*ft-javascript-omni*
6431+
ft-json-syntax syntax.txt /*ft-json-syntax*
64286432
ft-ksh-syntax syntax.txt /*ft-ksh-syntax*
64296433
ft-lace-syntax syntax.txt /*ft-lace-syntax*
64306434
ft-lex-syntax syntax.txt /*ft-lex-syntax*
@@ -7411,6 +7415,7 @@ join() eval.txt /*join()*
74117415
js_decode() eval.txt /*js_decode()*
74127416
js_encode() eval.txt /*js_encode()*
74137417
jsbterm-mouse options.txt /*jsbterm-mouse*
7418+
json.vim syntax.txt /*json.vim*
74147419
json_decode() eval.txt /*json_decode()*
74157420
json_encode() eval.txt /*json_encode()*
74167421
jtags tagsrch.txt /*jtags*
@@ -8646,6 +8651,7 @@ scriptversion eval.txt /*scriptversion*
86468651
scriptversion-1 eval.txt /*scriptversion-1*
86478652
scriptversion-2 eval.txt /*scriptversion-2*
86488653
scriptversion-3 eval.txt /*scriptversion-3*
8654+
scriptversion-4 eval.txt /*scriptversion-4*
86498655
scroll-binding scroll.txt /*scroll-binding*
86508656
scroll-cursor scroll.txt /*scroll-cursor*
86518657
scroll-down scroll.txt /*scroll-down*
@@ -8925,6 +8931,7 @@ starting.txt starting.txt /*starting.txt*
89258931
startup starting.txt /*startup*
89268932
startup-options starting.txt /*startup-options*
89278933
startup-terminal term.txt /*startup-terminal*
8934+
state() eval.txt /*state()*
89288935
static-tag tagsrch.txt /*static-tag*
89298936
status-line windows.txt /*status-line*
89308937
statusmsg-variable eval.txt /*statusmsg-variable*

runtime/doc/terminal.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*terminal.txt* For Vim version 8.1. Last change: 2019 Sep 08
1+
*terminal.txt* For Vim version 8.1. Last change: 2019 Sep 20
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1225,8 +1225,10 @@ gdb:
12251225
`:Run` [args] run the program with [args] or the previous arguments
12261226
`:Arguments` {args} set arguments for the next `:Run`
12271227

1228-
*:Break* set a breakpoint at the current line; a sign will be displayed
1229-
*:Clear* delete the breakpoint at the current line
1228+
*:Break* set a breakpoint at the cursor position
1229+
:Break {position}
1230+
set a breakpoint at the specified position
1231+
*:Clear* delete the breakpoint at the cursor position
12301232

12311233
*:Step* execute the gdb "step" command
12321234
*:Over* execute the gdb "next" command (`:Next` is a Vim command)

runtime/doc/todo.txt

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.1. Last change: 2019 Sep 10
1+
*todo.txt* For Vim version 8.1. Last change: 2019 Sep 19
22

33

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

41-
Split off part of option.c: #4918
41+
Add test for state().
42+
Add test for using SafeState and SafeStateAgain autocommand.
43+
Then plugin can:
44+
- When callback is invoked and state() returns non-empty, add to work queue
45+
- When SafeState autocommand event triggers, process work queue
46+
47+
Fix for "x" should be done by fixing "dl" ? 8.1.2052
48+
49+
'completeopt' "popup" variant that uses a callback after the popup has been
50+
created, so the contents can be changed. Make it hidden, callback
51+
or later has to make it visible. #4924 Setting the buffer contents later
52+
doesn't work well.
4253

4354
Popup windows:
55+
- Use popup (or popup menu) for command line completion
4456
- Implement flip option
4557
- Why does 'nrformats' leak from the popup window buffer???
4658
Happens in Test_simple_popup() at the second screendump.
@@ -130,6 +142,11 @@ E278, E279, E290, E292, E362, E366, E450, E451, E452,
130142
E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
131143
E654, E856, E857, E860, E861, E863, E889, E900
132144

145+
Improve running tests on MS-Windows: #4922
146+
147+
Patch to properly break CJK lines: #3875
148+
Ready to include now?
149+
133150
Remove check for cmd_silent when calling search_stat()? (Gary Johnson)
134151

135152
undo result wrong: Masato Nishihata, #4798
@@ -510,9 +527,6 @@ Further xdiff changes:
510527

511528
Difference between two regexp engines: #3373
512529

513-
Patch to properly break CJK lines: #3875
514-
Requires more tests. dbcs_ functions are not implemented.
515-
516530
Patch to add ch_listen() (Yasuhiro Matsumoto, 2018 Nov 26, #3639)
517531
What is the practical use for this?
518532

@@ -783,7 +797,7 @@ Problem with 'delcombine'. (agguser, 2017 Nov 10, #2313)
783797
MS-Windows: buffer completion doesn't work when using backslash (or slash)
784798
for a path separator. (xtal8, #2201)
785799

786-
Would be nice for insert mode completion to highlight the text that was added
800+
Would be nice for Insert mode completion to highlight the text that was added
787801
(and may change when picking another completion).
788802

789803
Test runtime files.
@@ -1894,9 +1908,6 @@ Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2,
18941908
only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
18951909
21, Ben Fritz, 2010 Sep 14)
18961910

1897-
'cursorline' works on a text line only. Add 'cursorscreenline' for
1898-
highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
1899-
19001911
Win32: Patch to use task dialogs when available. (Sergiu Dotenco, 2011 Sep 17)
19011912
New feature, requires testing. Made some remarks.
19021913

0 commit comments

Comments
 (0)