patch 9.0.1915: r_CTRL-C works differently in visual mode
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: #13091
closes: #13112
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index a00049b..65da9a7 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 9.0. Last change: 2023 Mar 07
+*change.txt* For Vim version 9.0. Last change: 2023 Sep 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -210,6 +210,7 @@
*v_r*
{Visual}r{char} Replace all selected characters by {char}.
+ CTRL-C will be inserted literally.
*v_C*
{Visual}["x]C Delete the highlighted lines [into register x] and
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 540d5c5..616e773 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt* For Vim version 9.0. Last change: 2022 Dec 04
+*visual.txt* For Vim version 9.0. Last change: 2023 Sep 19
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -183,6 +183,8 @@
CTRL-C In Visual mode: Stop Visual mode. When insert mode is
pending (the mode message shows
"-- (insert) VISUAL --"), it is also stopped.
+ On MS-Windows, you may need to press CTRL-Break
+ |dos-CTRL-Break|.
==============================================================================
3. Changing the Visual area *visual-change*
diff --git a/src/normal.c b/src/normal.c
index 86b8740..9f203b8 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4799,7 +4799,7 @@
if (VIsual_active)
{
if (got_int)
- reset_VIsual();
+ got_int = FALSE;
if (had_ctrl_v)
{
// Use a special (negative) number to make a difference between a
diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim
index 58b7392..290641e 100644
--- a/src/testdir/test_visual.vim
+++ b/src/testdir/test_visual.vim
@@ -1573,4 +1573,18 @@
call StopVimInTerminal(buf)
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
diff --git a/src/version.c b/src/version.c
index 809fb60..03cb97f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1915,
+/**/
1914,
/**/
1913,