From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 2 May 2014 13:46:14 +0000 (+0200)
Subject: updated for version 7.4.274
X-Git-Tag: v7.4.274
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7611f60cde29639b655ddb4494b98886c318870;p=vim

updated for version 7.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.
---

diff --git a/src/fileio.c b/src/fileio.c
index f8b384b9e..a45ec2cfd 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 3b8fb5261..3356879fd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    274,
 /**/
     273,
 /**/