aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-12 16:38:09 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-12 20:45:38 +1300
commita2281bd121949f2215ee9257e28e2c0966f3f003 (patch)
treec0643cd7c649245c3f355629f5c9a94e464bf68e /vim/after/ftplugin/sh
parentExclude SC1090 (failed source) shellcheck error (diff)
downloaddotfiles-a2281bd121949f2215ee9257e28e2c0966f3f003.tar.gz
dotfiles-a2281bd121949f2215ee9257e28e2c0966f3f003.zip
Add guards for presence of b:undo_* var
This variable is not set in older Vims (early 6.x), and I think it's worth guarding for.
Diffstat (limited to 'vim/after/ftplugin/sh')
-rw-r--r--vim/after/ftplugin/sh/bash_han.vim12
-rw-r--r--vim/after/ftplugin/sh/check.vim24
-rw-r--r--vim/after/ftplugin/sh/lint.vim24
-rw-r--r--vim/after/ftplugin/sh/posix.vim6
4 files changed, 44 insertions, 22 deletions
diff --git a/vim/after/ftplugin/sh/bash_han.vim b/vim/after/ftplugin/sh/bash_han.vim
index c1997d7e..a160165c 100644
--- a/vim/after/ftplugin/sh/bash_han.vim
+++ b/vim/after/ftplugin/sh/bash_han.vim
@@ -4,12 +4,16 @@ if exists('b:did_ftplugin_sh_bash_han') || &compatible
finish
endif
let b:did_ftplugin_sh_bash_han = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_sh_bash_han'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_sh_bash_han'
+endif
" Use han(1df) as a man(1) wrapper for Bash files if available
if exists('b:is_bash') && executable('han')
setlocal keywordprg=han
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|setlocal keywordprg<'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|setlocal keywordprg<'
+ endif
endif
diff --git a/vim/after/ftplugin/sh/check.vim b/vim/after/ftplugin/sh/check.vim
index 5000137d..334ec1db 100644
--- a/vim/after/ftplugin/sh/check.vim
+++ b/vim/after/ftplugin/sh/check.vim
@@ -4,8 +4,10 @@ if exists('b:did_ftplugin_sh_check') || &compatible
finish
endif
let b:did_ftplugin_sh_check = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_sh_check'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_sh_check'
+endif
" Choose checker based on shell family
if exists('b:is_bash')
@@ -15,8 +17,10 @@ elseif exists('b:is_kornshell')
else
let b:sh_check = 'write !sh -n'
endif
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:sh_check'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:sh_check'
+endif
" Set up a mapping for the checker, if we're allowed
if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
@@ -25,16 +29,20 @@ if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
nnoremap <buffer> <silent> <unique>
\ <Plug>ShCheck
\ :<C-U>execute b:sh_check<CR>
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>ShCheck'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>ShCheck'
+ endif
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>ShCheck')
nmap <buffer> <unique>
\ <LocalLeader>c
\ <Plug>ShCheck
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>c'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>c'
+ endif
endif
endif
diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim
index b6377966..8745a31e 100644
--- a/vim/after/ftplugin/sh/lint.vim
+++ b/vim/after/ftplugin/sh/lint.vim
@@ -4,8 +4,10 @@ if exists('b:did_ftplugin_sh_lint') || &compatible
finish
endif
let b:did_ftplugin_sh_lint = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_sh_lint'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_sh_lint'
+endif
" Choose linter based on shell family
if exists('b:is_bash')
@@ -15,8 +17,10 @@ elseif exists('b:is_kornshell')
else
let b:sh_lint = 'write !shellcheck -e SC1090 -s sh -'
endif
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:sh_lint'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:sh_lint'
+endif
" Set up a mapping for the linter, if we're allowed
if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
@@ -25,16 +29,20 @@ if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps')
nnoremap <buffer> <silent> <unique>
\ <Plug>ShLint
\ :<C-U>execute b:sh_lint<CR>
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>ShLint'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>ShLint'
+ endif
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>ShLint')
nmap <buffer> <unique>
\ <LocalLeader>l
\ <Plug>ShLint
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>l'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>l'
+ endif
endif
endif
diff --git a/vim/after/ftplugin/sh/posix.vim b/vim/after/ftplugin/sh/posix.vim
index ef6b9b93..a1b2c7ff 100644
--- a/vim/after/ftplugin/sh/posix.vim
+++ b/vim/after/ftplugin/sh/posix.vim
@@ -4,8 +4,10 @@ if exists('b:did_ftplugin_sh_posix') || &compatible
finish
endif
let b:did_ftplugin_sh_posix = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_sh_posix'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_sh_posix'
+endif
"
" If we have a #!/bin/sh shebang and filetype.vim determined we were neither