aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/html
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/html
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/html')
-rw-r--r--vim/after/ftplugin/html/lint.vim20
-rw-r--r--vim/after/ftplugin/html/tidy.vim18
-rw-r--r--vim/after/ftplugin/html/url_link.vim18
3 files changed, 38 insertions, 18 deletions
diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim
index f6648056..3ac760ed 100644
--- a/vim/after/ftplugin/html/lint.vim
+++ b/vim/after/ftplugin/html/lint.vim
@@ -4,8 +4,12 @@ if exists('b:did_ftplugin_html_lint') || &compatible
finish
endif
let b:did_ftplugin_html_lint = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_html_lint'
+
+" Initialise undo variable if not already done
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_lint'
+endif
" Set up a mapping for the linter, if we're allowed
if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
@@ -14,16 +18,20 @@ if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlLint
\ :<C-U>write !tidy -errors -quiet<CR>
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlLint'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlLint'
+ endif
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlLint')
nmap <buffer> <unique>
\ <LocalLeader>l
\ <Plug>HtmlLint
- 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/html/tidy.vim b/vim/after/ftplugin/html/tidy.vim
index e5d24541..519a7cd6 100644
--- a/vim/after/ftplugin/html/tidy.vim
+++ b/vim/after/ftplugin/html/tidy.vim
@@ -4,8 +4,10 @@ if exists('b:did_ftplugin_html_tidy') || &compatible
finish
endif
let b:did_ftplugin_html_tidy = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_html_tidy'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_tidy'
+endif
" Set up a mapping for the tidier, if we're allowed
if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
@@ -14,16 +16,20 @@ if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlTidy
\ :<C-U>%!tidy -quiet<CR>
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlTidy'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlTidy'
+ endif
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlTidy')
nmap <buffer> <unique>
\ <LocalLeader>t
\ <Plug>HtmlTidy
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>t'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>t'
+ endif
endif
endif
diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim
index cb0d6253..4f2d2526 100644
--- a/vim/after/ftplugin/html/url_link.vim
+++ b/vim/after/ftplugin/html/url_link.vim
@@ -4,8 +4,10 @@ if exists('b:did_ftplugin_html_url_link') || &compatible
finish
endif
let b:did_ftplugin_html_url_link = 1
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_html_url_link'
+if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_url_link'
+endif
" Make a bare URL into a link to itself
if !exists('*s:UrlLink')
@@ -32,16 +34,20 @@ if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlUrlLink
\ :<C-U>call <SID>HtmlUrlLink()<CR>
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlUrlLink'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlUrlLink'
+ endif
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlUrlLink')
nmap <buffer> <unique>
\ <LocalLeader>r
\ <Plug>HtmlUrlLink
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>r'
+ if exists('b:undo_ftplugin')
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>r'
+ endif
endif
endif