From 233c41cb8cfe1aa5a8520fe6104adacc53c0ece2 Mon Sep 17 00:00:00 2001
From: yamatsum <42740055+yamatsum@users.noreply.github.com>
Date: Fri, 13 May 2022 09:28:10 +0900
Subject: feat(defaults): search selection by * and # in visual mode (#18538)

---
 src/nvim/getchar.c         | 2 ++
 src/nvim/testdir/setup.vim | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index df45de2abf..3c465db4f9 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -848,6 +848,8 @@ void init_default_mappings(void)
           MODE_NORMAL, true);
   add_map((char_u *)"<C-U> <C-G>u<C-U>", MODE_INSERT, true);
   add_map((char_u *)"<C-W> <C-G>u<C-W>", MODE_INSERT, true);
+  add_map((char_u *)"* y/\\\\V<C-R>\"<CR>", MODE_VISUAL, true);
+  add_map((char_u *)"# y?\\\\V<C-R>\"<CR>", MODE_VISUAL, true);
 }
 
 // Insert a string in position 'offset' in the typeahead buffer (for "@r"
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
index 15e3b31498..f1092af358 100644
--- a/src/nvim/testdir/setup.vim
+++ b/src/nvim/testdir/setup.vim
@@ -26,11 +26,9 @@ set sessionoptions+=options
 set viewoptions+=options
 set switchbuf=
 
-" Unmap Nvim default mappings.
-unmap Y
-unmap <C-L>
-iunmap <C-U>
-iunmap <C-W>
+" Clear Nvim default mappings.
+mapclear
+mapclear!
 
 " Prevent Nvim log from writing to stderr.
 let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log'
-- 
cgit