patch 9.0.0082: cannot interrupt global command from command line

Problem:    Cannot interrupt global command from command line.
Solution:   Reset got_int in another place. (closes #10739)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index dd538941efce3cdc3b09dae9f81de61e6536d40a..7fbfded1f278324ad413a529c32cdb1b522aeecb 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1786,8 +1786,6 @@ getcmdline_int(
                                // that occurs while typing a command should
                                // cause the command not to be executed.
 
-       got_int = FALSE;        // avoid infinite Ctrl-C loop in Ex mode
-
        // Trigger SafeState if nothing is pending.
        may_trigger_safestate(xpc.xp_numfiles <= 0);
 
@@ -1850,7 +1848,8 @@ getcmdline_int(
                && firstc != '@'
 #endif
 #ifdef FEAT_EVAL
-               && !break_ctrl_c
+               // do clear got_int in Ex mode to avoid infinite Ctrl-C loop
+               && (!break_ctrl_c || exmode_active)
 #endif
                && !global_busy)
            got_int = FALSE;

diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index 50bc1db997049eb113f4ee900468b74abb30b177..2e14e01fa3d53a3687791a41e42b496140240f63 100644 (file)
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -156,6 +156,7 @@ func Test_Ex_append_in_loop()
   call term_sendkeys(buf, "append\<CR>")
   call WaitForAssert({-> assert_match(':  append', term_getline(buf, 5))}, 1000)
   call term_sendkeys(buf, "\<C-C>")
+  " Wait for input to be flushed
   call term_wait(buf)
   call term_sendkeys(buf, "foo\<CR>")
   call WaitForAssert({-> assert_match('foo', term_getline(buf, 5))}, 1000)

diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim
index 62f588afb8e6b646fe0fd0f96935aec37ff95404..75b56e033f821a607339aadfe819e3f8f018a2bf 100644 (file)
--- a/src/testdir/test_global.vim
+++ b/src/testdir/test_global.vim
@@ -1,6 +1,7 @@
 " Test for :global and :vglobal
 
 source check.vim
+source term_util.vim
 
 func Test_yank_put_clipboard()
   new
@@ -107,4 +108,31 @@ func Test_wrong_delimiter()
   call assert_fails('g x^bxd', 'E146:')
 endfunc
 
+" Test for interrupting :global using Ctrl-C
+func Test_interrupt_global()
+  CheckRunVimInTerminal
+  let lines =<< trim END
+    cnoremap ; <Cmd>sleep 10<CR>
+    call setline(1, repeat(['foo'], 5))
+  END
+  call writefile(lines, 'Xtest_interrupt_global')
+  let buf = RunVimInTerminal('-S Xtest_interrupt_global', {'rows': 6})
+
+  call term_sendkeys(buf, ":g/foo/norm :\<C-V>;\<CR>")
+  " Wait for :sleep to start
+  call term_wait(buf)
+  call term_sendkeys(buf, "\<C-C>")
+  call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 6))}, 1000)
+
+  " Also test in Ex mode
+  call term_sendkeys(buf, "gQg/foo/norm :\<C-V>;\<CR>")
+  " Wait for :sleep to start
+  call term_wait(buf)
+  call term_sendkeys(buf, "\<C-C>")
+  call WaitForAssert({-> assert_match('Interrupted', term_getline(buf, 5))}, 1000)
+
+  call StopVimInTerminal(buf)
+  call delete('Xtest_interrupt_global')
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index ad0c1a9dd2a8ce51fbc21edb833fa3a37e82e6fa..1ecfefceb3ebb53adaf6541e8155b3bc883748ac 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    82,
 /**/
     81,
 /**/