aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2020-02-10 21:31:35 +0100
committerTeddy Wing2020-02-10 21:31:35 +0100
commit196b6e08cc06d40e85f1d58b1455230196a0a871 (patch)
tree2ee9037b6b1aed64ebe1e1dd163df90025d54ab7
parent47ba0419998edd81d5e85dc91201238fa8bb7909 (diff)
downloadvim-searchop-196b6e08cc06d40e85f1d58b1455230196a0a871.tar.bz2
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.
-rw-r--r--plugin/searchop.vim8
1 files changed, 6 insertions, 2 deletions
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