Merge #8618 'Replace b_changedtick with always-inline functions'

1 files changed, 7 insertions, 7 deletions

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 3b6a3a7995..5ddb3952de 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -3566,13 +3566,13 @@ restore_backup:
    * writing to the original file and '+' is not in 'cpoptions'. */
   if (reset_changed && whole && !append
       && !write_info.bw_conv_error
-      && (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 (buf->b_last_changedtick + 1 == buf->b_changedtick) {
-      buf->b_last_changedtick = buf->b_changedtick;
+      && (overwriting || vim_strchr(p_cpo, CPO_PLUS) != NULL)) {
+    unchanged(buf, true);
+    const varnumber_T changedtick = buf_get_changedtick(buf);
+    if (buf->b_last_changedtick + 1 == changedtick) {
+      // changedtick is always incremented in unchanged() but that
+      // should not trigger a TextChanged event.
+      buf->b_last_changedtick = changedtick;
     }
     u_unchanged(buf);
     u_update_save_nr(buf);