kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1915: r_CTRL-C works differently in visual mode

Browse Source 
Problem:  r_CTRL-C works differently in visual mode
Solution: Make r_CTRL-C behave consistent in visual mode
          in terminal and Windows GUI

in visual mode, r CTRL-C behaves strange in Unix like environments. It
seems to end visual mode, but still is waiting for few more chars,
however it never seems to replace it by any characters and eventually
just returns back into normal mode.

In contrast in Windows GUI mode, r_CTRL-C replaces in the selected area
all characters by a literal CTRL-C.

Not sure why it behaves like this. It seems in the Windows GUI, got_int
is not set and therefore behaves as if any other normal character has
been pressed.

So remove the special casing of what happens when got_int is set and
make it always behave like in Windows GUI mode. Add a test to verify it
always behaves like replacing in the selected area each selected
character by a literal CTRL-C.

closes: vim/vim#13091
closes: vim/vim#13112

476733f3d0

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2023-09-20 05:59:01 +08:00
parent 5a363ccac8
commit d2678c78dc
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/doc/change.txt
View File

@ -196,6 +196,7 @@ gR Enter Virtual Replace mode: Each character you type
*v_r* *v_r*
{Visual}r{char} Replace all selected characters by {char}. {Visual}r{char} Replace all selected characters by {char}.
CTRL-C will be inserted literally.
*v_C* *v_C*
{Visual}["x]C Delete the highlighted lines [into register x] and {Visual}["x]C Delete the highlighted lines [into register x] and

1
runtime/doc/visual.txt
View File

@ -169,6 +169,7 @@ If you want to highlight exactly the same area as the last time, you can use
CTRL-C In Visual mode: Stop Visual mode. When insert mode is CTRL-C In Visual mode: Stop Visual mode. When insert mode is
pending (the mode message shows pending (the mode message shows
"-- (insert) VISUAL --"), it is also stopped. "-- (insert) VISUAL --"), it is also stopped.
On MS-Windows, you may need to press CTRL-Break.
============================================================================== ==============================================================================
3. Changing the Visual area *visual-change* 3. Changing the Visual area *visual-change*

2
src/nvim/normal.c
View File

@ -4513,7 +4513,7 @@ static void nv_replace(cmdarg_T *cap)
// Visual mode "r" // Visual mode "r"
if (VIsual_active) { if (VIsual_active) {
if (got_int) { if (got_int) {
reset_VIsual(); got_int = false;
} }
if (had_ctrl_v) { if (had_ctrl_v) {
// Use a special (negative) number to make a difference between a // Use a special (negative) number to make a difference between a

14
test/old/testdir/test_visual.vim
View File

@ -1577,4 +1577,18 @@ func Test_visual_hl_with_showbreak()
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
func Test_Visual_r_CTRL_C()
new
" visual r_cmd
call setline(1, [' '])
call feedkeys("\<c-v>$r\<c-c>", 'tx')
call assert_equal([''], getline(1, 1))
" visual gr_cmd
call setline(1, [' '])
call feedkeys("\<c-v>$gr\<c-c>", 'tx')
call assert_equal([''], getline(1, 1))
bw!
endfu
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab