patch 8.2.3517: TextChanged does not trigger after TextChangedI
Problem: TextChanged does not trigger after TextChangedI.
Solution: Store the tick separately for TextChangedI. (Christian Brabandt,
closes #8968, closes #8932)
diff --git a/src/buffer.c b/src/buffer.c
index 56c1bf2..86dc886 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -327,6 +327,7 @@
// Set last_changedtick to avoid triggering a TextChanged autocommand right
// after it was added.
curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
+ curbuf->b_last_changedtick_i = CHANGEDTICK(curbuf);
curbuf->b_last_changedtick_pum = CHANGEDTICK(curbuf);
// require "!" to overwrite the file, because it wasn't read completely
diff --git a/src/bufwrite.c b/src/bufwrite.c
index 772d707..0313e0c 100644
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -2422,8 +2422,8 @@
&& (overwriting || vim_strchr(p_cpo, CPO_PLUS) != NULL))
{
unchanged(buf, TRUE, FALSE);
- // b:changedtick is may be incremented in unchanged() but that
- // should not trigger a TextChanged event.
+ // b:changedtick may be incremented in unchanged() but that should not
+ // trigger a TextChanged event.
if (buf->b_last_changedtick + 1 == CHANGEDTICK(buf))
buf->b_last_changedtick = CHANGEDTICK(buf);
u_unchanged(buf);
diff --git a/src/edit.c b/src/edit.c
index 4f8e374..686c6d4 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1477,9 +1477,9 @@
last_cursormoved = curwin->w_cursor;
}
- // Trigger TextChangedI if b_changedtick differs.
+ // Trigger TextChangedI if b_changedtick_i differs.
if (ready && has_textchangedI()
- && curbuf->b_last_changedtick != CHANGEDTICK(curbuf)
+ && curbuf->b_last_changedtick_i != CHANGEDTICK(curbuf)
&& !pum_visible())
{
aco_save_T aco;
@@ -1489,15 +1489,15 @@
aucmd_prepbuf(&aco, curbuf);
apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf);
aucmd_restbuf(&aco);
- curbuf->b_last_changedtick = CHANGEDTICK(curbuf);
+ curbuf->b_last_changedtick_i = CHANGEDTICK(curbuf);
if (tick != CHANGEDTICK(curbuf)) // see ins_apply_autocmds()
u_save(curwin->w_cursor.lnum,
(linenr_T)(curwin->w_cursor.lnum + 1));
}
- // Trigger TextChangedP if b_changedtick differs. When the popupmenu closes
- // TextChangedI will need to trigger for backwards compatibility, thus use
- // different b_last_changedtick* variables.
+ // Trigger TextChangedP if b_changedtick_pum differs. When the popupmenu
+ // closes TextChangedI will need to trigger for backwards compatibility,
+ // thus use different b_last_changedtick* variables.
if (ready && has_textchangedP()
&& curbuf->b_last_changedtick_pum != CHANGEDTICK(curbuf)
&& pum_visible())
diff --git a/src/structs.h b/src/structs.h
index 7dac95b..83a13a7 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -2701,10 +2701,10 @@
// incremented for each change, also for undo
#define CHANGEDTICK(buf) ((buf)->b_ct_di.di_tv.vval.v_number)
- varnumber_T b_last_changedtick; // b:changedtick when TextChanged or
- // TextChangedI was last triggered.
- varnumber_T b_last_changedtick_pum; // b:changedtick when TextChangedP was
+ varnumber_T b_last_changedtick; // b:changedtick when TextChanged was
// last triggered.
+ varnumber_T b_last_changedtick_pum; // b:changedtick for TextChangedP
+ varnumber_T b_last_changedtick_i; // b:changedtick for TextChangedI
int b_saving; // Set to TRUE if we are in the middle of
// saving the buffer.
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index db1efba..7faa455 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
Binary files differ
diff --git a/src/version.c b/src/version.c
index dfe5139..d142759 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3517,
+/**/
3516,
/**/
3515,