summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-31 19:51:36 +0100
committerBram Moolenaar <Bram@vim.org>2014-10-31 19:51:36 +0100
commit086329d3f6b1182b6817433a1c498e1e746d2a3b (patch)
tree82a9ace9b89f81dd92635dc549055145e3cc9215
parent2f31e399780f434c9635a1da969020824440e03b (diff)
downloadvim-git-086329d3f6b1182b6817433a1c498e1e746d2a3b.tar.gz
updated for version 7.4.493v7.4.493
Problem: A TextChanged autocommand is triggered when saving a file. (William Gardner) Solution: Update last_changedtick after calling unchanged(). (Christian Brabandt)
-rw-r--r--src/fileio.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c
index c7e846b82..0843d0429 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4877,6 +4877,13 @@ restore_backup:
)
{
unchanged(buf, TRUE);
+#ifdef FEAT_AUTOCMD
+ /* 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;
+#endif
u_unchanged(buf);
u_update_save_nr(buf);
}
diff --git a/src/version.c b/src/version.c
index 69538140c..378818e66 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 493,
+/**/
492,
/**/
491,