diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/fileio.c | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 82613f5b07..58e67fa58c 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -3583,6 +3583,12 @@ restore_backup: && (overwriting || vim_strchr(p_cpo, CPO_PLUS) != NULL) ) { unchanged(buf, TRUE); + /* buf->b_changedtick is always incremented in unchanged() but that + * should not trigger a TextChanged event. */ + if (last_changedtick + 1 == buf->b_changedtick + && last_changedtick_buf == buf) { + last_changedtick = buf->b_changedtick; + } u_unchanged(buf); u_update_save_nr(buf); } diff --git a/src/nvim/version.c b/src/nvim/version.c index 08862de715..9a5d3fefe8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -245,7 +245,7 @@ static int included_patches[] = { //496 NA //495 NA 494, - //493, + 493, //492, //491, //490, |