aboutsummaryrefslogtreecommitdiff
path: root/runtime/ftplugin
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-22 23:08:48 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-27 09:21:27 -0400
commitb1fed1ada9635f762cb9b3a7f2fe38df6f166df4 (patch)
tree902105afdb2ab3b400d7a1f503063a923a420d44 /runtime/ftplugin
parent766a10783982936da8f1eaf61280338fcd85019a (diff)
downloadrneovim-b1fed1ada9635f762cb9b3a7f2fe38df6f166df4.tar.gz
rneovim-b1fed1ada9635f762cb9b3a7f2fe38df6f166df4.tar.bz2
rneovim-b1fed1ada9635f762cb9b3a7f2fe38df6f166df4.zip
vim-patch:5be4ceecea55
Update runtime files. https://github.com/vim/vim/commit/5be4ceecea5520265066eac972460ebb1cdf05e7
Diffstat (limited to 'runtime/ftplugin')
-rw-r--r--runtime/ftplugin/bash.vim19
-rw-r--r--runtime/ftplugin/matlab.vim5
2 files changed, 7 insertions, 17 deletions
diff --git a/runtime/ftplugin/bash.vim b/runtime/ftplugin/bash.vim
index a3d01fc2ad..7bd9787b6c 100644
--- a/runtime/ftplugin/bash.vim
+++ b/runtime/ftplugin/bash.vim
@@ -11,21 +11,10 @@ if exists("b:did_ftplugin")
finish
endif
+unlet! b:is_sh
+unlet! b:is_kornshell
let b:is_bash = 1
-if exists("b:is_sh")
- unlet b:is_sh
-endif
-if exists("b:is_kornshell")
- unlet b:is_kornshell
-endif
-" Setting 'filetype' here directly won't work, since we are being invoked
-" through an autocommand. Do it later, on the BufWinEnter event.
-augroup bash_filetype
- au BufWinEnter * call SetBashFt()
-augroup END
+runtime! ftplugin/sh.vim ftplugin/sh_*.vim ftplugin/sh/*.vim
-func SetBashFt()
- au! bash_filetype
- set ft=sh
-endfunc
+" vim: ts=8
diff --git a/runtime/ftplugin/matlab.vim b/runtime/ftplugin/matlab.vim
index 205111c3c2..a1a282f19e 100644
--- a/runtime/ftplugin/matlab.vim
+++ b/runtime/ftplugin/matlab.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: matlab
" Maintainer: Jake Wasserman <jwasserman at gmail dot com>
-" Last Changed: 2014 Dec 30
+" Last Change: 2019 Sep 27
" Contributors:
" Charles Campbell
@@ -24,8 +24,9 @@ endif
setlocal suffixesadd=.m
setlocal suffixes+=.asv
+setlocal commentstring=%\ %s
-let b:undo_ftplugin = "setlocal suffixesadd< suffixes< "
+let b:undo_ftplugin = "setlocal suffixesadd< suffixes< commentstring< "
\ . "| unlet! b:match_words"
let &cpo = s:save_cpo