diff options
author | Bram Moolenaar <Bram@vim.org> | 2014-05-02 15:46:14 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2014-05-02 15:46:14 +0200 |
commit | a7611f60cde29639b655ddb4494b98886c318870 (patch) | |
tree | 137a8a8585af0f4476c12d16c3b6ef3de3e00f83 | |
parent | bcb9898eba8c7dd7ed9a909c7055b2ab49cd8f6c (diff) |
updated for version 7.4.274v7.4.274
Problem: When doing ":update" just before running an external command that
changes the file, the timestamp may be unchanged and the file
is not reloaded.
Solution: Also check the file size.
-rw-r--r-- | src/fileio.c | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/fileio.c b/src/fileio.c index f8b384b9e9..a45ec2cfd7 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -6897,6 +6897,7 @@ buf_check_timestamp(buf, focus) && buf->b_mtime != 0 && ((stat_res = mch_stat((char *)buf->b_ffname, &st)) < 0 || time_differs((long)st.st_mtime, buf->b_mtime) + || st.st_size != buf->b_orig_size #ifdef HAVE_ST_MODE || (int)st.st_mode != buf->b_orig_mode #else diff --git a/src/version.c b/src/version.c index 3b8fb52613..3356879fdb 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 274, +/**/ 273, /**/ 272, |