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/sh/lint.vim | |
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/sh/lint.vim')
-rw-r--r-- | vim/after/ftplugin/sh/lint.vim | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/vim/after/ftplugin/sh/lint.vim b/vim/after/ftplugin/sh/lint.vim index a8d65702..b89645f7 100644 --- a/vim/after/ftplugin/sh/lint.vim +++ b/vim/after/ftplugin/sh/lint.vim @@ -36,27 +36,27 @@ function! s:ShLint() cwindow endfunction -" Set up a mapping for the linter, if we're allowed -if !exists('g:no_plugin_maps') && !exists('g:no_sh_maps') +" Stop here if the user doesn't want ftplugin mappings +if exists('g:no_plugin_maps') || exists('g:no_sh_maps') + finish +endif - " Define a mapping target - nnoremap <buffer> <silent> <unique> +" Define a mapping target +nnoremap <buffer> <silent> <unique> + \ <Plug>ShLint + \ :<C-U>call <SID>ShLint()<CR> +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 - \ :<C-U>call <SID>ShLint()<CR> 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 - if exists('b:undo_ftplugin') - let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>l' - endif + \ . '|nunmap <buffer> <LocalLeader>l' endif - endif |