diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-16 21:59:31 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-16 21:59:31 +1200 |
commit | 88defc4fc528bad2b0664c634d95e4363665472d (patch) | |
tree | 333f2a15365563c5af18e92fa331de0190ae9046 /vim/after/ftplugin/html | |
parent | Correct g:current_compiler setting (diff) | |
download | dotfiles-88defc4fc528bad2b0664c634d95e4363665472d.tar.gz dotfiles-88defc4fc528bad2b0664c634d95e4363665472d.zip |
Use short-circuit for no-mapping check
Diffstat (limited to 'vim/after/ftplugin/html')
-rw-r--r-- | vim/after/ftplugin/html/lint.vim | 36 | ||||
-rw-r--r-- | vim/after/ftplugin/html/tidy.vim | 36 | ||||
-rw-r--r-- | vim/after/ftplugin/html/url_link.vim | 36 |
3 files changed, 54 insertions, 54 deletions
diff --git a/vim/after/ftplugin/html/lint.vim b/vim/after/ftplugin/html/lint.vim index 65742267..64df3447 100644 --- a/vim/after/ftplugin/html/lint.vim +++ b/vim/after/ftplugin/html/lint.vim @@ -27,27 +27,27 @@ function! s:HtmlLint() cwindow endfunction -" Set up a mapping for the linter, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish +endif - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" Define a mapping target +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 + +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlLint') + nmap <buffer> <unique> + \ <LocalLeader>l \ <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 - - " 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 + \ . '|nunmap <buffer> <LocalLeader>l' endif - endif diff --git a/vim/after/ftplugin/html/tidy.vim b/vim/after/ftplugin/html/tidy.vim index 6e612feb..3d14e79e 100644 --- a/vim/after/ftplugin/html/tidy.vim +++ b/vim/after/ftplugin/html/tidy.vim @@ -13,27 +13,27 @@ if exists('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') +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish +endif - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" Define a mapping target +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 + +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlTidy') + nmap <buffer> <unique> + \ <LocalLeader>t \ <Plug>HtmlTidy - \ :<C-U>%!tidy -quiet<CR> 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 - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>t' - endif + \ . '|nunmap <buffer> <LocalLeader>t' endif - endif diff --git a/vim/after/ftplugin/html/url_link.vim b/vim/after/ftplugin/html/url_link.vim index a5a926d6..c256b3b9 100644 --- a/vim/after/ftplugin/html/url_link.vim +++ b/vim/after/ftplugin/html/url_link.vim @@ -29,27 +29,27 @@ function! s:HtmlUrlLink() endfunction -" Set up a mapping for the function, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_html_maps') +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_html_maps') + finish +endif - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" Define a mapping target +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 + +" If there isn't a key mapping already, use a default one +if !hasmapto('<Plug>HtmlUrlLink') + nmap <buffer> <unique> + \ <LocalLeader>r \ <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 - - " 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 + \ . '|nunmap <buffer> <LocalLeader>r' endif - endif |