diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-04 22:05:54 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-04 22:05:54 -0500 |
| commit | 6bfe0daf63c3311df2b3c734c2518b79d7e68842 (patch) | |
| tree | 4d24cedbc101edace37f612afda879f5bbf4a423 /runtime/ftplugin | |
| parent | 10ff6ee0d7efedc4e3812b39dc8327b8aeef57a7 (diff) | |
| parent | 099fdb49a700f851f0165089fc2ca06807591f6a (diff) | |
| download | rneovim-6bfe0daf63c3311df2b3c734c2518b79d7e68842.tar.gz rneovim-6bfe0daf63c3311df2b3c734c2518b79d7e68842.tar.bz2 rneovim-6bfe0daf63c3311df2b3c734c2518b79d7e68842.zip | |
Merge pull request #1772 from fwalch/vim-6921742
vim-patch:6921742, vim-patch:37c2403 (runtime updates)
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/dockerfile.vim | 16 | ||||
| -rw-r--r-- | runtime/ftplugin/vim.vim | 11 |
2 files changed, 23 insertions, 4 deletions
diff --git a/runtime/ftplugin/dockerfile.vim b/runtime/ftplugin/dockerfile.vim new file mode 100644 index 0000000000..2e3c447b59 --- /dev/null +++ b/runtime/ftplugin/dockerfile.vim @@ -0,0 +1,16 @@ +" Vim filetype plugin +" Language: Dockerfile +" Maintainer: Honza Pokorny <http://honza.ca> +" Last Change: 2014 Aug 29 + +" Only do this when not done yet for this buffer +if exists("b:did_ftplugin") + finish +endif + +" Don't load another plugin for this buffer +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setl commentstring<" + +setlocal commentstring=#\ %s diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim index edba37b896..f355d2837d 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 |