lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
e7105e2
To: vim_dev@googlegroups.com
e7105e2
Subject: Patch 7.4.274
e7105e2
Fcc: outbox
e7105e2
From: Bram Moolenaar <Bram@moolenaar.net>
e7105e2
Mime-Version: 1.0
e7105e2
Content-Type: text/plain; charset=UTF-8
e7105e2
Content-Transfer-Encoding: 8bit
e7105e2
------------
e7105e2
e7105e2
Patch 7.4.274
e7105e2
Problem:    When doing ":update" just before running an external command that
e7105e2
	    changes the file, the timestamp may be unchanged and the file
e7105e2
	    is not reloaded.
e7105e2
Solution:   Also check the file size.
e7105e2
Files:	    src/fileio.c
e7105e2
e7105e2
e7105e2
*** ../vim-7.4.273/src/fileio.c	2014-04-06 20:45:40.123357453 +0200
e7105e2
--- src/fileio.c	2014-05-02 15:35:19.671279728 +0200
e7105e2
***************
e7105e2
*** 6897,6902 ****
e7105e2
--- 6897,6903 ----
e7105e2
  	    && buf->b_mtime != 0
e7105e2
  	    && ((stat_res = mch_stat((char *)buf->b_ffname, &st)) < 0
e7105e2
  		|| time_differs((long)st.st_mtime, buf->b_mtime)
e7105e2
+ 		|| st.st_size != buf->b_orig_size
e7105e2
  #ifdef HAVE_ST_MODE
e7105e2
  		|| (int)st.st_mode != buf->b_orig_mode
e7105e2
  #else
e7105e2
*** ../vim-7.4.273/src/version.c	2014-04-29 20:04:05.331539784 +0200
e7105e2
--- src/version.c	2014-05-02 15:36:22.619278625 +0200
e7105e2
***************
e7105e2
*** 736,737 ****
e7105e2
--- 736,739 ----
e7105e2
  {   /* Add new patch number below this line */
e7105e2
+ /**/
e7105e2
+     274,
e7105e2
  /**/
e7105e2
e7105e2
-- 
e7105e2
A meeting is an event at which the minutes are kept and the hours are lost.
e7105e2
e7105e2
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
e7105e2
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
e7105e2
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
e7105e2
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///