From 88defc4fc528bad2b0664c634d95e4363665472d Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 16 Jun 2018 21:59:31 +1200
Subject: Use short-circuit for no-mapping check

---
 vim/after/ftplugin/sh/lint.vim | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'vim/after/ftplugin/sh/lint.vim')

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
-- 
cgit v1.2.3