summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fileio.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c
index cb839b8b9..9ce41d420 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6627,7 +6627,10 @@ buf_check_timestamp(buf, focus)
mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
mesg2 = _("See \":help W16\" for more info.");
}
- /* Else: only timestamp changed, ignored */
+ else
+ /* Only timestamp changed, store it to avoid a warning
+ * in check_mtime() later. */
+ buf->b_mtime_read = buf->b_mtime;
}
}
}
diff --git a/src/version.c b/src/version.c
index 22d18de4a..145ef2e6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 210,
+/**/
209,
/**/
208,