From d4f81fe865f4205248914a581edcb386cf5a5f5e Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <sanchayan@sanchayanmaity.net>
Date: Mon, 16 May 2022 18:25:12 +0530
Subject: [PATCH] nvim: plugin/visual-star-search: Set mark when doing backward
 search

While at it, drop calling set hlsearch for * and g* as hlsearch is
enabled by default and does not seem to be required.
---
 nvim/.config/nvim/plugin/visual-star-search.vim | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nvim/.config/nvim/plugin/visual-star-search.vim b/nvim/.config/nvim/plugin/visual-star-search.vim
index 198fa55..48c926a 100644
--- a/nvim/.config/nvim/plugin/visual-star-search.vim
+++ b/nvim/.config/nvim/plugin/visual-star-search.vim
@@ -15,9 +15,13 @@ func! s:get_visual_selection_searchpattern() abort
 endf
 
 " Read last visual-selection into command line
-cnoremap <c-r><c-v> <c-r>=join(<sid>get_visual_selection_list(), " ")<cr>
-inoremap <c-r><c-v> <c-r>=join(<sid>get_visual_selection_list(), " ")<cr>
+cnoremap <c-r><c-v> <c-r>=join(<sid>get_visual_selection_list(), " ")<CR>
+inoremap <c-r><c-v> <c-r>=join(<sid>get_visual_selection_list(), " ")<CR>
 
-xnoremap * <esc>ms/\V<c-r>=<sid>get_visual_selection_searchpattern()<cr><cr>
-nnoremap <silent> *  ms:<c-u>let @/='\V\<'.escape(expand('<cword>'), '/\').'\>'<bar>call histadd('/',@/)<bar>set hlsearch<cr>
-nnoremap <silent> g* ms:<c-u>let @/='\V' . escape(expand('<cword>'), '/\')     <bar>call histadd('/',@/)<bar>set hlsearch<cr>
+xnoremap * <esc>ms/\V<c-r>=<sid>get_visual_selection_searchpattern()<CR><CR>
+nnoremap <silent> *  ms:<c-u>let @/='\V\<'.escape(expand('<cword>'), '/\').'\>'<Bar>call histadd('/',@/)<CR>
+nnoremap <silent> g* ms:<c-u>let @/='\V' . escape(expand('<cword>'), '/\')     <Bar>call histadd('/',@/)<CR>
+
+" Use the setting of mark trick for backward search as well.
+nnoremap <silent> #  ms#<CR>
+nnoremap <silent> g# msg#<CR>