From fdee7afc4e9378f0235ef52fb35e63b8219e7ffd Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 14 Dec 2019 17:02:03 +0100
Subject: Remove unnecessary code in `CmdlineEnter` command

* The `s:Nohai()` function is unnecessary, as it does the same thing as
  `s:AddMapping()`. Call `s:AddMapping()` directly instead.
* Don't bother checking `cmdwin_char`. Because we limit the
  `CmdlineEnter` `autocmd` to `/` and `?`, the `s:AddMapping()` function
  will only ever be called on `/` and `?`, thus checking its value in a
  condition is redundant.
---
 plugin/nohai.vim | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/plugin/nohai.vim b/plugin/nohai.vim
index a6a30a0..dcb7630 100644
--- a/plugin/nohai.vim
+++ b/plugin/nohai.vim
@@ -1,13 +1,5 @@
-function! s:Nohai(cmdwin_char)
-	if a:cmdwin_char == '/' || a:cmdwin_char == '?'
-		call s:AddMapping(a:cmdwin_char)
-	endif
-endfunction
-
-function! s:AddMapping(cmdwin_char)
-	if a:cmdwin_char == '/' || a:cmdwin_char == '?'
-		silent! cnoremap <expr> <CR> <SID>CR()
-	endif
+function! s:AddMapping()
+	silent! cnoremap <expr> <CR> <SID>CR()
 endfunction
 
 function! s:RemoveMapping()
@@ -27,7 +19,7 @@ function! s:AutocmdOn()
 	augroup nohai
 		autocmd!
 
-		autocmd CmdlineEnter [/\?] call s:Nohai(expand('<afile>'))
+		autocmd CmdlineEnter [/\?] call s:AddMapping()
 		autocmd CmdlineLeave [/\?] call s:Deactivate()
 	augroup END
 endfunction
-- 
cgit v1.2.3