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/perl/check.vim | 36 ++++++++++++++++++------------------
 vim/after/ftplugin/perl/lint.vim  | 36 ++++++++++++++++++------------------
 vim/after/ftplugin/perl/tidy.vim  | 36 ++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'vim/after/ftplugin/perl')

diff --git a/vim/after/ftplugin/perl/check.vim b/vim/after/ftplugin/perl/check.vim
index a9b23c2b..e5eaf44a 100644
--- a/vim/after/ftplugin/perl/check.vim
+++ b/vim/after/ftplugin/perl/check.vim
@@ -21,27 +21,27 @@ function! s:PerlCheck()
   cwindow
 endfunction
 
-" Set up a mapping for the checker, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlCheck
+      \ :<C-U>call <SID>PerlCheck()<CR>
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <Plug>PerlCheck'
+endif
+
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlCheck')
+  nmap <buffer> <unique>
+        \ <LocalLeader>c
         \ <Plug>PerlCheck
-        \ :<C-U>call <SID>PerlCheck()<CR>
   if exists('b:undo_ftplugin')
     let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlCheck'
-  endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlCheck')
-    nmap <buffer> <unique>
-          \ <LocalLeader>c
-          \ <Plug>PerlCheck
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>c'
-    endif
+          \ . '|nunmap <buffer> <LocalLeader>c'
   endif
-
 endif
diff --git a/vim/after/ftplugin/perl/lint.vim b/vim/after/ftplugin/perl/lint.vim
index 235ee69a..50770a13 100644
--- a/vim/after/ftplugin/perl/lint.vim
+++ b/vim/after/ftplugin/perl/lint.vim
@@ -21,27 +21,27 @@ function! s:PerlLint()
   cwindow
 endfunction
 
-" Set up a mapping for the linter, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlLint
+      \ :<C-U>call <SID>PerlLint()<CR>
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <Plug>PerlLint'
+endif
+
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlLint')
+  nmap <buffer> <unique>
+        \ <LocalLeader>l
         \ <Plug>PerlLint
-        \ :<C-U>call <SID>PerlLint()<CR>
   if exists('b:undo_ftplugin')
     let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlLint'
-  endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlLint')
-    nmap <buffer> <unique>
-          \ <LocalLeader>l
-          \ <Plug>PerlLint
-    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/perl/tidy.vim b/vim/after/ftplugin/perl/tidy.vim
index 18033a42..bd3e73a1 100644
--- a/vim/after/ftplugin/perl/tidy.vim
+++ b/vim/after/ftplugin/perl/tidy.vim
@@ -9,27 +9,27 @@ if exists('b:undo_ftplugin')
         \ . '|unlet b:did_ftplugin_perl_tidy'
 endif
 
-" Set up a mapping for the tidier, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_perl_maps')
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_perl_maps')
+  finish
+endif
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>PerlTidy
+      \ :<C-U>%!perltidy<CR>
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <Plug>PerlTidy'
+endif
+
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>PerlTidy')
+  nmap <buffer> <unique>
+        \ <LocalLeader>t
         \ <Plug>PerlTidy
-        \ :<C-U>%!perltidy<CR>
   if exists('b:undo_ftplugin')
     let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>PerlTidy'
-  endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>PerlTidy')
-    nmap <buffer> <unique>
-          \ <LocalLeader>t
-          \ <Plug>PerlTidy
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>t'
-    endif
+          \ . '|nunmap <buffer> <LocalLeader>t'
   endif
-
 endif
-- 
cgit v1.2.3