From d69f3bbb0d3a0549466ac0e36a1364d1890b4691 Mon Sep 17 00:00:00 2001
From: rosston <ross.brandes@appropos.com>
Date: Fri, 9 Oct 2015 17:42:05 -0400
Subject: vim-patch:8feef4f #3444

Update runtime files.

https://github.com/vim/vim/commit/8feef4ff6253afb9dcc61c40082ed4fbb96b685c
---
 runtime/ftplugin/less.vim   | 20 ++++++++++++++++++++
 runtime/ftplugin/matlab.vim | 14 +++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 runtime/ftplugin/less.vim

(limited to 'runtime/ftplugin')

diff --git a/runtime/ftplugin/less.vim b/runtime/ftplugin/less.vim
new file mode 100644
index 0000000000..637e9d292e
--- /dev/null
+++ b/runtime/ftplugin/less.vim
@@ -0,0 +1,20 @@
+" Vim filetype plugin
+" Language:	less
+" Maintainer:	Alessandro Vioni <jenoma@gmail.com>
+" URL: https://github.com/genoma/vim-less
+" Last Change:	2014 November 24
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
+
+setlocal formatoptions-=t formatoptions+=croql
+
+setlocal comments=:// commentstring=//\ %s
+
+setlocal omnifunc=csscomplete#CompleteCSS
+setlocal suffixesadd=.less
diff --git a/runtime/ftplugin/matlab.vim b/runtime/ftplugin/matlab.vim
index 6bfb3d7618..205111c3c2 100644
--- a/runtime/ftplugin/matlab.vim
+++ b/runtime/ftplugin/matlab.vim
@@ -1,7 +1,10 @@
 " Vim filetype plugin file
 " Language:	matlab
 " Maintainer:	Jake Wasserman <jwasserman at gmail dot com>
-" Last Changed: 2006 Jan 12
+" Last Changed: 2014 Dec 30
+
+" Contributors:
+" Charles Campbell
 
 if exists("b:did_ftplugin")
 	finish
@@ -12,10 +15,11 @@ let s:save_cpo = &cpo
 set cpo-=C
 
 if exists("loaded_matchit")
-	let s:conditionalEnd = '\(([^()]*\)\@!\<end\>\([^()]*)\)\@!'
-	let b:match_words = '\<if\>\|\<while\>\|\<for\>\|\<switch\>:' .
-		\ s:conditionalEnd . ',\<if\>:\<elseif\>:\<else\>:' .
-		\ s:conditionalEnd
+ let s:conditionalEnd = '\%(([^()]*\)\@!\<end\>\%([^()]*)\)\@!'
+ let b:match_words=
+   \ '\<\%(if\|switch\|for\|while\)\>:\<\%(elseif\|case\|break\|continue\|else\|otherwise\)\>:'.s:conditionalEnd.','.
+   \ '\<function\>:\<return\>:\<endfunction\>'
+ unlet s:conditionalEnd
 endif
 
 setlocal suffixesadd=.m
-- 
cgit