summaryrefslogtreecommitdiff
path: root/runtime/ftplugin
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-09-09 18:48:09 +0200
committerBram Moolenaar <Bram@vim.org>2014-09-09 18:48:09 +0200
commit6e932461cb702368d98c846528ee8f30e3a46e27 (patch)
tree36f574ed07bf1361b6b94ec9ae485deef3a52283 /runtime/ftplugin
parent58da707d2412f60eb5c0e158ade48dd8a13c96ed (diff)
downloadvim-git-6e932461cb702368d98c846528ee8f30e3a46e27.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/ftplugin')
-rw-r--r--runtime/ftplugin/vim.vim11
1 files changed, 7 insertions, 4 deletions
diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index edba37b89..f355d2837 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin
" Language: Vim
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2013 Jun 26
+" Last Change: 2014 Sep 07
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -62,9 +62,12 @@ if exists("loaded_matchit")
\ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' .
\ '(:)'
- " Ignore ":syntax region" commands, the 'end' argument clobbers if-endif
- let b:match_skip = 'getline(".") =~ "^\\s*sy\\%[ntax]\\s\\+region" ||
- \ synIDattr(synID(line("."),col("."),1),"name") =~? "comment\\|string"'
+ " Ignore syntax region commands and settings, any 'en*' would clobber
+ " if-endif.
+ " - set spl=de,en
+ " - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ …
+ let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name")
+ \ =~? "comment\\|string\\|vimSynReg\\|vimSet"'
endif
let &cpo = s:cpo_save