Skip to content

Commit 0b0f099

Browse files
committed
Update runtime files.
1 parent 0b6d911 commit 0b0f099

15 files changed

Lines changed: 690 additions & 352 deletions

File tree

runtime/autoload/xmlformat.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
" Vim plugin for formatting XML
2-
" Last Change: Thu, 15 Jan 2015 21:26:55 +0100
2+
" Last Change: Thu, 22 May 2018 21:26:55 +0100
33
" Version: 0.1
44
" Author: Christian Brabandt <[email protected]>
55
" Script: http://www.vim.org/scripts/script.php?script_id=
@@ -30,7 +30,7 @@ func! xmlformat#Format()
3030
let lastitem = prev ? getline(prev) : ''
3131
let is_xml_decl = 0
3232
" split on `<`, but don't split on very first opening <
33-
for item in split(getline(v:lnum), '.\@<=[>]\zs')
33+
for item in split(join(getline(v:lnum, (v:lnum + v:count - 1))), '.\@<=[>]\zs')
3434
if s:EndTag(item)
3535
let s:indent = s:DecreaseIndent()
3636
call add(result, s:Indent(item))

runtime/colors/tools/check_colors.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
" This script tests a color scheme for some errors. Load the scheme and source
2-
" this script. e.g. :e colors/desert.vim | :so test_colors.vim
2+
" this script. e.g. :e colors/desert.vim | :so check_colors.vim
33
" Will output possible errors.
44

55
let s:save_cpo= &cpo

runtime/doc/eval.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5822,7 +5822,8 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]]) *maparg()*
58225822
listing.
58235823

58245824
When there is no mapping for {name}, an empty String is
5825-
returned.
5825+
returned. When the mapping for {name} is empty, then "<Nop>"
5826+
is returned.
58265827

58275828
The {name} can have special key names, like in the ":map"
58285829
command.
@@ -5889,9 +5890,10 @@ mapcheck({name} [, {mode} [, {abbr}]]) *mapcheck()*
58895890
mapping that matches with {name}, while maparg() only finds a
58905891
mapping for {name} exactly.
58915892
When there is no mapping that starts with {name}, an empty
5892-
String is returned. If there is one, the rhs of that mapping
5893+
String is returned. If there is one, the RHS of that mapping
58935894
is returned. If there are several mappings that start with
5894-
{name}, the rhs of one of them is returned.
5895+
{name}, the RHS of one of them is returned. This will be
5896+
"<Nop>" if the RHS is empty.
58955897
The mappings local to the current buffer are checked first,
58965898
then the global mappings.
58975899
This function can be used to check if a mapping can be added

runtime/doc/gui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ it behaves in a strange way.
999999
pointer instead of the cursor.
10001000
In the terminal this is the last known
10011001
position, which is usually at the last click
1002-
or release (mouse movement is irrelevalt).
1002+
or release (mouse movement is irrelevant).
10031003

10041004
Example: >
10051005
:popup File

runtime/doc/indent.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,25 @@ In PHP braces are not required inside 'case/default' blocks therefore 'case:'
907907
and 'default:' are indented at the same level than the 'switch()' to avoid
908908
meaningless indentation. You can use the above option to return to the
909909
traditional way.
910+
-------------
911+
912+
*PHP_noArrowMatching*
913+
By default the indent script will indent multi-line chained calls by matching
914+
the position of the '->': >
915+
916+
$user_name_very_long->name()
917+
->age()
918+
->info();
919+
920+
You can revert to the classic way of indenting by setting this option to 1: >
921+
:let g:PHP_noArrowMatching = 1
922+
923+
You will obtain the following result: >
924+
925+
$user_name_very_long->name()
926+
->age()
927+
->info();
928+
910929
911930
912931
PYTHON *ft-python-indent*

runtime/doc/options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5187,7 +5187,7 @@ A jump table for the options with a short description can be found at |Q_op|.
51875187
more depth, set 'maxfuncdepth' to a bigger number. But this will use
51885188
more memory, there is the danger of failing when memory is exhausted.
51895189
Increasing this limit above 200 also changes the maximum for Ex
5190-
command resursion, see |E169|.
5190+
command recursion, see |E169|.
51915191
See also |:function|.
51925192

51935193
*'maxmapdepth'* *'mmd'* *E223*

runtime/doc/tabpage.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ gT Go to the previous tab page. Wraps around from the first one
213213
:tabN[ext] {count}
214214
{count}<C-PageUp>
215215
{count}gT Go {count} tab pages back. Wraps around from the first one
216-
to the last one.
216+
to the last one. Note that the use of {count} is different
217+
from |:tabnext|, where it is used as the tab page number.
217218

218219
:tabr[ewind] *:tabfir* *:tabfirst* *:tabr* *:tabrewind*
219220
:tabfir[st] Go to the first tab page.

runtime/doc/tags

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4749,6 +4749,7 @@ PEP8 filetype.txt /*PEP8*
47494749
PHP_BracesAtCodeLevel indent.txt /*PHP_BracesAtCodeLevel*
47504750
PHP_autoformatcomment indent.txt /*PHP_autoformatcomment*
47514751
PHP_default_indenting indent.txt /*PHP_default_indenting*
4752+
PHP_noArrowMatching indent.txt /*PHP_noArrowMatching*
47524753
PHP_outdentSLComments indent.txt /*PHP_outdentSLComments*
47534754
PHP_outdentphpescape indent.txt /*PHP_outdentphpescape*
47544755
PHP_removeCRwhenUnix indent.txt /*PHP_removeCRwhenUnix*
@@ -8198,6 +8199,8 @@ redo-register undo.txt /*redo-register*
81988199
ref intro.txt /*ref*
81998200
reference intro.txt /*reference*
82008201
reference_toc help.txt /*reference_toc*
8202+
reg_executing() eval.txt /*reg_executing()*
8203+
reg_recording() eval.txt /*reg_recording()*
82018204
regexp pattern.txt /*regexp*
82028205
regexp-changes-5.4 version5.txt /*regexp-changes-5.4*
82038206
register sponsor.txt /*register*

runtime/doc/terminal.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Syntax ~
204204
++rows={height} Use {height} for the terminal window
205205
height. If the terminal uses the full
206206
Vim height (no window above or below
207-
th terminal window) the command line
207+
the terminal window) the command line
208208
height will be reduced as needed.
209209
++cols={width} Use {width} for the terminal window
210210
width. If the terminal uses the full
@@ -243,7 +243,7 @@ Trying to close the window with `CTRL-W :close` also fails. Using
243243
You can use `CTRL-W :hide` to close the terminal window and make the buffer
244244
hidden, the job keeps running. The `:buffer` command can be used to turn the
245245
current window into a terminal window. If there are unsaved changes this
246-
fails, use ! to force, as usual.
246+
fails, use ! to force, as usual.
247247

248248
To have a background job run without a window, and open the window when it's
249249
done, use options like this: >

runtime/doc/todo.txt

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ browser use: https://github.com/vim/vim/issues/1234
3939
-------------------- Known bugs and current work -----------------------
4040

4141
Terminal emulator window:
42-
- Win32: Termdebug doesn't work, because gdb does not support mi2.
42+
- Win32: Termdebug doesn't work, because gdb does not support mi2 on a tty.
4343
This plugin: https://github.com/cpiger/NeoDebug runs gdb as a job,
4444
redirecting input and output.
4545
Open new console for for program with: "set new-console on"
@@ -61,13 +61,13 @@ Terminal emulator window:
6161
after "run". Everything else works, including communication channel. Not
6262
initializing mzscheme avoid the problem, thus it's not some #ifdef.
6363

64-
Patch to refactor efm_to_regpat(). (Yegappan Lakshmanan, 2018 May 16, #2924)
64+
Does not build with MinGW out of the box:
65+
- _stat64 is not defined, need to use "struct stat" in vim.h
66+
- WINVER conflict, should use 0x0600 by default?
6567

6668
Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May
6769
13, #2910) Can't reproduce?
6870

69-
Deprecate using has("patch213") always include the version number.
70-
7171
On Win32 when not in the console and t_Co >= 256, allow using 'tgc'.
7272
(Nobuhiro Takasaki, #2833) Also check t_Co.
7373

@@ -123,11 +123,8 @@ CreateFile() returns ERROR_SHARING_VIOLATION (Linwei, 2018 May 5)
123123
Should add a test for every command line argument. Check coverage for what is
124124
missing: --nofork, -A , -b, -h, etc.
125125

126-
Completing a command sometimes results in duplicates, since 7.4.672.
127-
(Yegappan Lakshmanan, 2018 May 16)
128-
Duplication of completion suggestions for ":!hom". Issue #539.
129-
Patch by Christian, 2016 Jan 29
130-
Another patch in #2733.
126+
Patch for variable tabstops. On github (Christian Brabandt, 2014 May 15)
127+
Update 2018 March 12, #2711
131128

132129
Improve the installer for MS-Windows. There are a few alternatives:
133130
- Add silent install option. (Shane Lee, #751)
@@ -152,6 +149,7 @@ When using :packadd files under "later" are not used, which is inconsistent
152149
with packages under "start". (xtal8, #1994)
153150

154151
Patch to support "xxd -ps". (Erik Auerswald, 2018 May 1)
152+
Lacks a test.
155153

156154
Column number is wrong when using 'linebreak' and 'wrap'. (Keith Smiley, 2018
157155
Jan 15, #2555)
@@ -160,8 +158,6 @@ Jan 15, #2555)
160158

161159
Check argument of systemlist(). (Pavlov)
162160

163-
Patch to add reg_executing() and reg_recording(). (Hirohito Higashi, #2745)
164-
165161
No maintainer for Vietnamese translations.
166162
No maintainer for Simplified Chinese translations.
167163

@@ -1184,9 +1180,6 @@ Patch for building a 32bit Vim with 64bit MingW compiler.
11841180
Patch: On MS-Windows shellescape() may have to triple double quotes.
11851181
(Ingo Karkat, 2015 Jan 16)
11861182

1187-
Patch for variable tabstops. On github (Christian Brabandt, 2014 May 15)
1188-
Update 2018 March 12, #2711
1189-
11901183
Redo only remembers the last change. Could use "{count}g." to redo an older
11911184
change. How does the user know which change? At least have a way to list
11921185
them: ":repeats".

0 commit comments

Comments
 (0)