patch 9.1.0088: TextChanged not triggered for :norm! commands

Problem:  TextChanged not triggered for :norm! commands
          (machakann, after v9.0.2031)
Solution: Only reset curbuf->b_last_changedtick if TextChangedI
          was triggered in insert mode (and not blocked)

Note: for unknown reasons, the test fails on Windows (but seems to work
fine when running interactively)

fixes: #13967
closes: #13984

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/edit.c b/src/edit.c
index e9a994f6b28fcb4d0753b8335fa1d96a6a896253..5760b06e86680c6f5f0b00d8e466bcec85e73e84 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -843,7 +843,12 @@ doESCkey:
                if (cmdchar != 'r' && cmdchar != 'v' && c != Ctrl_C)
                    ins_apply_autocmds(EVENT_INSERTLEAVE);
                did_cursorhold = FALSE;
-               curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
+
+               // ins_redraw() triggers TextChangedI only when no characters
+               // are in the typeahead buffer, so only reset curbuf->b_last_changedtick
+               // if the TextChangedI was not blocked by char_avail() (e.g. using :norm!)
+               if (!char_avail())
+                   curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
                return (c == Ctrl_O);
            }
            continue;

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index be73c18197ea5995ff0f2a5780458180c94d24b4..6e1223275f24eb1156e673e779cf8b3132a86fb0 100644 (file)
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2706,6 +2706,24 @@ func Test_TextChangedI_with_setline()
   bwipe!
 endfunc
 
+func Test_TextChanged_with_norm()
+  " For unknown reason this fails on MS-Windows
+  CheckNotMSWindows
+  CheckFeature terminal
+  let buf = term_start([GetVimProg(), '--clean', '-c', 'set noswapfile'], {'term_rows': 3})
+  call assert_equal('running', term_getstatus(buf))
+  call term_sendkeys(buf, ":let g:a=0\<cr>")
+  call term_wait(buf, 50)
+  call term_sendkeys(buf, ":au! TextChanged * :let g:a+=1\<cr>")
+  call term_wait(buf, 50)
+  call term_sendkeys(buf, ":norm! ia\<cr>")
+  call term_wait(buf, 50)
+  call term_sendkeys(buf, ":echo g:a\<cr>")
+  call term_wait(buf, 50)
+  call WaitForAssert({-> assert_match('^1.*$', term_getline(buf, 3))})
+  bwipe!
+endfunc
+
 func Test_Changed_FirstTime()
   CheckFeature terminal
   CheckNotGui

diff --git a/src/version.c b/src/version.c
index 08a78b600113c811de6fc21d039d1a599daa30d2..1332f46baac1c3e617438d1015b3f867dcb77392 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    88,
 /**/
     87,
 /**/