To: vim-dev@vim.org
Subject: Patch 6.1.118
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.118
Problem:    When a file in diff mode is reloaded because it changed outside
	    of Vim, other windows in diff mode are not always updated.
	    (Michael Naumann)
Solution:   After reloading a file in diff mode mark all windows in diff mode
	    for redraw.
Files:	    src/diff.c


*** ../vim61.117/src/diff.c	Wed May  1 19:40:35 2002
--- src/diff.c	Sun Jun 30 15:55:37 2002
***************
*** 150,162 ****
  }
  
  /*
!  * Mark the diff info as invalid, update it when info is requested.
   */
      void
  diff_invalidate()
  {
      if (curwin->w_p_diff)
  	diff_invalid = TRUE;
  }
  
  /*
--- 150,165 ----
  }
  
  /*
!  * Mark the diff info as invalid, it will be updated when info is requested.
   */
      void
  diff_invalidate()
  {
      if (curwin->w_p_diff)
+     {
  	diff_invalid = TRUE;
+ 	diff_redraw(TRUE);
+     }
  }
  
  /*
*** ../vim61.117/src/version.c	Sat Jun 29 16:51:40 2002
--- src/version.c	Sun Jun 30 15:59:09 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     118,
  /**/

-- 
ARTHUR:        A scratch?  Your arm's off!
BLACK KNIGHT:  No, it isn't.
ARTHUR:        Well, what's that then?
BLACK KNIGHT:  I've had worse.
                                  The Quest for the Holy Grail (Monty Python)

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///