patch 9.0.0788: ModeChanged autocmd not executed when Visual ends with CTRL-C

Problem:    ModeChanged autocmd not executed when Visual mode is ended with
            CTRL-C.
Solution:   Do not trigger the autocmd when got_int is set. (closes #11394)

diff --git a/src/misc1.c b/src/misc1.c
index ee79e694a3485dc29ec0be3e09c0630078e2b229..c968bf67f6a67869dddbcf0907c6d1fcda1cb5f5 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -330,6 +330,7 @@ get_last_leader_offset(char_u *line, char_u **flags)
 
 /*
  * Return the number of window lines occupied by buffer line "lnum".
+ * Includes any filler lines.
  */
     int
 plines(linenr_T lnum)
@@ -349,6 +350,10 @@ plines_win(
     return plines_win_nofill(wp, lnum, winheight) + diff_check_fill(wp, lnum);
 }
 
+/*
+ * Return the number of window lines occupied by buffer line "lnum".
+ * Does not include filler lines.
+ */
     int
 plines_nofill(linenr_T lnum)
 {
@@ -2754,7 +2759,9 @@ may_trigger_modechanged()
     char_u         curr_mode[MODE_MAX_LENGTH];
     char_u         pattern_buf[2 * MODE_MAX_LENGTH];
 
-    if (!has_modechanged())
+    // Skip this when got_int is set, the autocommand will not be executed.
+    // Better trigger it next time.
+    if (!has_modechanged() || got_int)
        return;
 
     get_mode(curr_mode);

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 3698fd57ee4b15555956ac99afe0736c9f9e0d5f..0706e73070a00d644b036226cbc6b3cdc3304d68 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -3429,6 +3429,18 @@ func Test_mode_changes()
   unlet g:n_to_c
   unlet g:c_to_n
 
+  let g:n_to_v = 0
+  au ModeChanged n:v let g:n_to_v += 1
+  let g:v_to_n = 0
+  au ModeChanged v:n let g:v_to_n += 1
+  let g:mode_seq += ['v', 'n']
+  call feedkeys("v\<C-C>", 'tnix')
+  call assert_equal(len(g:mode_seq) - 1, g:index)
+  call assert_equal(1, g:n_to_v)
+  call assert_equal(1, g:v_to_n)
+  unlet g:n_to_v
+  unlet g:v_to_n
+
   au! ModeChanged
   delfunc TestMode
   unlet! g:mode_seq

diff --git a/src/version.c b/src/version.c
index 87baf994b74557238549b4af621693d55965b060..1c511f94b589893232126a7e24f9aa24ea3fa445 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    788,
 /**/
     787,
 /**/