From b332aebe252c812ec4068892db4fad71b8075185 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Sun, 4 Jan 2015 19:37:32 +0100
Subject: vim-patch:6921742

Update runtime files.

https://code.google.com/p/vim/source/detail?r=6921742f396a4abd21d7f69843b804ca0b96059c
---
 runtime/ftplugin/dockerfile.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 runtime/ftplugin/dockerfile.vim

(limited to 'runtime/ftplugin')

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
-- 
cgit 


From 2624d66045ab6e5cd1c38165316e9c304f38fa18 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Sun, 4 Jan 2015 20:26:51 +0100
Subject: vim-patch:37c2403

Update runtime files.

https://code.google.com/p/vim/source/detail?r=37c24033b2601a4a0953970a0ec85d5537101915
---
 runtime/ftplugin/vim.vim | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'runtime/ftplugin')

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
-- 
cgit