To: vim-dev@vim.org

Subject: Patch 7.2.133

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 7.2.133

Problem:    ":diffoff!" changes settings in windows not in diff mode.

Solution:   Only change settings in other windows when 'diff' is set, always

	    do it for the current window. (Lech Lorens)

Files:	    src/diff.c

*** ../vim-7.2.132/src/diff.c	Thu Jan 22 20:48:07 2009

--- src/diff.c	Fri Mar  6 04:17:41 2009

***************

*** 1153,1159 ****

      for (wp = firstwin; wp != NULL; wp = wp->w_next)

      {

! 	if (wp == curwin || eap->forceit)

  	{

  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */

  	    wp->w_p_diff = FALSE;

--- 1153,1159 ----

      for (wp = firstwin; wp != NULL; wp = wp->w_next)

      {

! 	if (wp == curwin || (eap->forceit && wp->w_p_diff))

  	{

  	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */

  	    wp->w_p_diff = FALSE;

*** ../vim-7.2.132/src/version.c	Thu Mar  5 03:13:51 2009

--- src/version.c	Wed Mar 11 12:45:10 2009

***************

*** 678,679 ****

--- 678,681 ----

  {   /* Add new patch number below this line */

+ /**/

+     133,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

192. Your boss asks you to "go fer" coffee and you come up with 235 FTP sites.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///