From 10c601851625784c7058f52c8d88bdb2e99b5620 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 8 Jul 2018 23:13:02 +1200 Subject: Overhaul base after-ftplugins Mostly to simplify them--remove a lot of the load-guard cruft. --- vim/after/ftplugin/sh.vim | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'vim/after/ftplugin/sh.vim') diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 05c3e293..086e23d5 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -1,22 +1,14 @@ -" Extra configuration for 'sh' filetypes -if exists('b:did_ftplugin_after') || &compatible +" Extra configuration for shell script +if &filetype != 'sh' || &compatible || v:version < 700 finish endif -if v:version < 700 - finish -endif -if &filetype !=# 'sh' - finish -endif -let b:did_ftplugin_after = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_after' " Set comment formats setlocal comments=:# setlocal formatoptions+=or let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal comments< formatoptions<' + \ . '|setlocal comments<' + \ . '|setlocal formatoptions<' " If subtype is Bash, set 'keywordprg' to han(1df) if exists('b:is_bash') @@ -38,6 +30,8 @@ elseif exists('b:is_kornshell') else let b:sh_check_compiler = 'sh' endif +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:sh_check_compiler' " Set mappings nnoremap c -- cgit v1.2.3