From 196b6e08cc06d40e85f1d58b1455230196a0a871 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Mon, 10 Feb 2020 21:31:35 +0100
Subject: plugin/searchop.vim: Fix default map guards

Check for normal and visual modes separately before defining default
mappings. Previously I was only verifying that normal mode mappings were
available and defining visual mode mappings without explicit checks.
---
 plugin/searchop.vim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugin')

diff --git a/plugin/searchop.vim b/plugin/searchop.vim
index aeac62a..395a7c3 100644
--- a/plugin/searchop.vim
+++ b/plugin/searchop.vim
@@ -28,12 +28,16 @@ vnoremap <silent> <Plug>(searchop-backward)
 	\ :<C-u>call searchop#SearchBackward(visualmode(), 1)<CR>
 
 
-if !hasmapto('<Plug>(searchop-forward)') && !maparg('z*', 'n')
+if !hasmapto('<Plug>(searchop-forward)', 'n') && !maparg('z*', 'n')
 	nmap z* <Plug>(searchop-forward)
+endif
+if !hasmapto('<Plug>(searchop-forward)', 'v') && !maparg('z*', 'v')
 	vmap z* <Plug>(searchop-forward)
 endif
 
-if !hasmapto('<Plug>(searchop-backward)') && !maparg('z#', 'n')
+if !hasmapto('<Plug>(searchop-backward)', 'n') && !maparg('z#', 'n')
 	nmap z# <Plug>(searchop-backward)
+endif
+if !hasmapto('<Plug>(searchop-backward)', 'v') && !maparg('z#', 'v')
 	vmap z# <Plug>(searchop-backward)
 endif
-- 
cgit v1.2.3