Skip to content

Commit b5e3fec

Browse files
committed
vim-patch:2f0584910c0e
Update runtime files vim/vim@2f05849
1 parent 15a7133 commit b5e3fec

File tree

7 files changed

+1028
-447
lines changed

7 files changed

+1028
-447
lines changed

runtime/doc/eval.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4336,11 +4336,11 @@ getqflist([{what}]) *getqflist()*
43364336
following string items are supported in {what}:
43374337
context get the context stored with |setqflist()|
43384338
efm errorformat to use when parsing "lines". If
4339-
not present, then the 'erroformat' option
4339+
not present, then the 'errorformat' option
43404340
value is used.
43414341
id get information for the quickfix list with
43424342
|quickfix-ID|; zero means the id for the
4343-
current list or the list specifed by "nr"
4343+
current list or the list specified by "nr"
43444344
items quickfix list entries
43454345
lines use 'errorformat' to extract items from a list
43464346
of lines and return the resulting entries.
@@ -7563,8 +7563,9 @@ submatch({nr} [, {list}]) *submatch()* *E935*
75637563
When substitute() is used recursively only the submatches in
75647564
the current (deepest) call can be obtained.
75657565

7566-
Example: >
7566+
Examples: >
75677567
:s/\d\+/\=submatch(0) + 1/
7568+
:echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
75687569
< This finds the first number in the line and adds one to it.
75697570
A line break is included as a newline character.
75707571

runtime/doc/insert.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,8 @@ it here: http://ctags.sourceforge.net/ Version 5.6 or later is recommended.
12751275
For version 5.5.4 you should add a patch that adds the "typename:" field:
12761276
ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
12771277
A compiled .exe for MS-Windows can be found at:
1278-
http://georgevreilly.com/vim/ctags.html
1278+
http://ctags.sourceforge.net/
1279+
https://github.com/universal-ctags/ctags-win32
12791280

12801281
If you want to complete system functions you can do something like this. Use
12811282
ctags to generate a tags file for all the system header files: >

runtime/doc/options.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,8 +3316,8 @@ A jump table for the options with a short description can be found at |Q_op|.
33163316
pattern and/or a lot of text the match may not be found. This is to
33173317
avoid that Vim hangs while you are typing the pattern.
33183318
The |hl-IncSearch| highlight group determines the highlighting.
3319-
When 'hlsearch' is on, all matched strings are highlighted too while typing
3320-
a search command. See also: 'hlsearch'.
3319+
When 'hlsearch' is on, all matched strings are highlighted too while
3320+
typing a search command. See also: 'hlsearch'.
33213321
If you don't want turn 'hlsearch' on, but want to highlight all matches
33223322
while searching, you can turn on and off 'hlsearch' with autocmd.
33233323
Example: >

runtime/filetype.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,8 +1877,8 @@ au BufNewFile,BufRead *.yy,*.yxx,*.y++ setf yacc
18771877
" Yacc or racc
18781878
au BufNewFile,BufRead *.y call dist#ft#FTy()
18791879

1880-
" Yaml
1881-
au BufNewFile,BufRead *.yaml,*.yml setf yaml
1880+
" Yaml or Raml
1881+
au BufNewFile,BufRead *.yaml,*.yml,*.raml setf yaml
18821882

18831883
" yum conf (close enough to dosini)
18841884
au BufNewFile,BufRead */etc/yum.conf setf dosini

runtime/ftplugin/zsh.vim

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: Zsh shell script
33
" Maintainer: Christian Brabandt <cb@256bit.org>
44
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
5-
" Latest Revision: 2015-05-29
5+
" Latest Revision: 2017-11-22
66
" License: Vim (see :h license)
77
" Repository: https://github.com/chrisbra/vim-zsh
88

@@ -18,9 +18,7 @@ let b:undo_ftplugin = "setl com< cms< fo<"
1818

1919
setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
2020

21-
let b:match_words =
22-
\ &matchpairs
23-
\ . ',\<if\>:\<elif\>:\<else\>:\<fi\>'
21+
let b:match_words = ',\<if\>:\<elif\>:\<else\>:\<fi\>'
2422
\ . ',\<case\>:^\s*([^)]*):\<esac\>'
2523
\ . ',\<\%(select\|while\|until\|repeat\|for\%(each\)\=\)\>:\<done\>'
2624
let b:match_skip = 's:comment\|string\|heredoc\|subst'

0 commit comments

Comments
 (0)