From 8b6eae719fee4302796817e040d992629b456954 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 23 Jun 2018 11:19:58 +1200
Subject: Handle visual mode better in Vim mappings

---
 vim/vimrc | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 431a51c9..96023a77 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -175,17 +175,26 @@ if has('windows')
 
 endif
 
-" Rebind normal <Space> to scroll down a page
+" Rebind normal, visual <Space> to scroll down a page
 nnoremap <Space> <C-F>
+if v:version >= 700
+  xnoremap <Space> <C-F>
+endif
 
-" Rebind normal & to preserve substitution flags
+" Rebind normal, visual & to preserve substitution flags
 nnoremap <silent> & :<C-U>&&<CR>
+if v:version >= 700
+  xnoremap <silent> & :&&<CR>
+endif
 
 " Stack insert Ctrl-C to undo the escaped insert operation
 inoremap <C-C> <C-C>u
 
-" Stack normal Ctrl-L to clear search highlighting before redraw
+" Stack normal, visual Ctrl-L to clear search highlight before redraw
 nnoremap <silent> <C-L> :<C-U>nohlsearch<CR><C-L>
+if v:version >= 700
+  xnoremap <silent> <C-L> :<C-U>nohlsearch<CR>gv<C-L>
+endif
 
 " Cycle through argument list
 nnoremap [a :<C-U>previous<CR>
-- 
cgit v1.2.3