aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/html
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-17 00:19:45 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-17 00:19:45 +1200
commit81ff3c0f3ae44bb88a129b7395cb050290a37518 (patch)
treed0cf48de5513c8bfff929ff24473dc6bc441f9e9 /vim/after/ftplugin/html
parentUse short-circuit for no-mapping check (diff)
downloaddotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.tar.gz
dotfiles-81ff3c0f3ae44bb88a129b7395cb050290a37518.zip
Completely overhaul after/ftplugin files
Should have done some of this in separate commits; oh well. * Rewrite headers for each ftplugin * Require Vim version >= 7.0, and thereby: * Switch back to location list * Don't check for b:undo_ftplugin existence, assume it * Save and restore compiler instead of internal options * Add bash, ksh, sh, and shellcheck compilers * Rename mail/format_flowed.vim to mail/flowed.vim * Rename sh/bash_han.vim to sh/han.vim
Diffstat (limited to 'vim/after/ftplugin/html')
-rw-r--r--vim/after/ftplugin/html/lint.vim52
-rw-r--r--vim/after/ftplugin/html/tidy.vim37
-rw-r--r--vim/after/ftplugin/html/url_link.vim37
3 files changed, 67 insertions, 59 deletions
diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim
index 64df3447..a3776d60 100644
--- a/vim/after/ftplugin/html/lint.vim
+++ b/vim/after/ftplugin/html/lint.vim
@@ -1,30 +1,36 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled, or if the current filetype is
-" actually markdown
-if exists('b:did_ftplugin_html_lint') || &compatible
+" html/lint.vim: Use tidy(1) to lint HTML documents for errors
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
finish
endif
-if &filetype ==# 'markdown'
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_html_lint')
finish
endif
-let b:did_ftplugin_html_lint = 1
-" 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'
+" Don't load if the primary filetype isn't HTML
+if &filetype !=# 'html'
+ finish
endif
+" Flag as loaded
+let b:did_ftplugin_html_lint = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_lint'
+
" Build function for linter
function! s:HtmlLint()
- let l:save_makeprg = &l:makeprg
- let l:save_errorformat = &l:errorformat
- unlet! g:current_compiler
+ if exists('b:current_compiler')
+ let l:save_compiler = b:current_compiler
+ endif
compiler tidy
- make!
- let &l:makeprg = l:save_makeprg
- let &l:errorformat = l:save_errorformat
- cwindow
+ lmake!
+ lwindow
+ if exists('l:save_compiler')
+ execute 'compiler ' . l:save_compiler
+ endif
endfunction
" Stop here if the user doesn't want ftplugin mappings
@@ -36,18 +42,14 @@ endif
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlLint
\ :<C-U>call <SID>HtmlLint()<CR>
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlLint'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlLint'
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlLint')
nmap <buffer> <unique>
\ <LocalLeader>l
\ <Plug>HtmlLint
- if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>l'
- endif
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>l'
endif
diff --git a/vim/after/ftplugin/html/tidy.vim b/vim/after/ftplugin/html/tidy.vim
index 3d14e79e..e0c43f01 100644
--- a/vim/after/ftplugin/html/tidy.vim
+++ b/vim/after/ftplugin/html/tidy.vim
@@ -1,18 +1,25 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled, or if the current filetype is
-" actually markdown
-if exists('b:did_ftplugin_html_tidy') || &compatible
+" html/tidy.vim: Use tidy(1) to filter HTML documents
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
finish
endif
-if &filetype ==# 'markdown'
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_html_tidy')
finish
endif
-let b:did_ftplugin_html_tidy = 1
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_html_tidy'
+
+" Don't load if the primary filetype isn't HTML
+if &filetype !=# 'html'
+ finish
endif
+" Flag as loaded
+let b:did_ftplugin_html_tidy = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_tidy'
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_html_maps')
finish
@@ -22,18 +29,14 @@ endif
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlTidy
\ :<C-U>%!tidy -quiet<CR>
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlTidy'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlTidy'
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlTidy')
nmap <buffer> <unique>
\ <LocalLeader>t
\ <Plug>HtmlTidy
- if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>t'
- endif
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>t'
endif
diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim
index c256b3b9..1cf57a7b 100644
--- a/vim/after/ftplugin/html/url_link.vim
+++ b/vim/after/ftplugin/html/url_link.vim
@@ -1,18 +1,25 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled, or if the current filetype is
-" actually markdown
-if exists('b:did_ftplugin_html_url_link') || &compatible
+" html/url_link.vim: Make a URL into a link
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
finish
endif
-if &filetype ==# 'markdown'
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_html_url_link')
finish
endif
-let b:did_ftplugin_html_url_link = 1
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|unlet b:did_ftplugin_html_url_link'
+
+" Don't load if the primary filetype isn't HTML
+if &filetype !=# 'html'
+ finish
endif
+" Flag as loaded
+let b:did_ftplugin_html_url_link = 1
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|unlet b:did_ftplugin_html_url_link'
+
" Make a bare URL into a link to itself
function! s:HtmlUrlLink()
@@ -38,18 +45,14 @@ endif
nnoremap <buffer> <silent> <unique>
\ <Plug>HtmlUrlLink
\ :<C-U>call <SID>HtmlUrlLink()<CR>
-if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <Plug>HtmlUrlLink'
-endif
+let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <Plug>HtmlUrlLink'
" If there isn't a key mapping already, use a default one
if !hasmapto('<Plug>HtmlUrlLink')
nmap <buffer> <unique>
\ <LocalLeader>r
\ <Plug>HtmlUrlLink
- if exists('b:undo_ftplugin')
- let b:undo_ftplugin = b:undo_ftplugin
- \ . '|nunmap <buffer> <LocalLeader>r'
- endif
+ let b:undo_ftplugin = b:undo_ftplugin
+ \ . '|nunmap <buffer> <LocalLeader>r'
endif