jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.274

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