]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.274 v7.4.274
authorBram Moolenaar <Bram@vim.org>
Fri, 2 May 2014 13:46:14 +0000 (15:46 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 2 May 2014 13:46:14 +0000 (15:46 +0200)
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.

src/fileio.c
src/version.c

index f8b384b9e9e18c0b458d34d7dcd738f3d90352dc..a45ec2cfd76311e68da51fbad929f1f1bce5823f 100644 (file)
@@ -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
index 3b8fb52613547a7329d2673612c67ea5f72f5fbd..3356879fdba411571a970482fe748c7d315d3981 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    274,
 /**/
     273,
 /**/