Karsten Hopp 81c285
To: vim-dev@vim.org
Karsten Hopp 81c285
Subject: Patch 7.2.242
Karsten Hopp 81c285
Fcc: outbox
Karsten Hopp 81c285
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 81c285
Mime-Version: 1.0
Karsten Hopp 81c285
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 81c285
Content-Transfer-Encoding: 8bit
Karsten Hopp 81c285
------------
Karsten Hopp 81c285
Karsten Hopp 81c285
Patch 7.2.242
Karsten Hopp 81c285
Problem:    Setting 'lazyredraw' causes the cursor column to be recomputed.
Karsten Hopp 81c285
	    (Tom Link)
Karsten Hopp 81c285
Solution:   Only recompute the cursor column for a boolean option if changes
Karsten Hopp 81c285
	    the cursor position.
Karsten Hopp 81c285
Files:	    src/option.c
Karsten Hopp 81c285
Karsten Hopp 81c285
Karsten Hopp 81c285
*** ../vim-7.2.241/src/option.c	2009-07-22 14:27:33.000000000 +0200
Karsten Hopp 81c285
--- src/option.c	2009-07-29 10:03:39.000000000 +0200
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 7194,7199 ****
Karsten Hopp 81c285
--- 7194,7207 ----
Karsten Hopp 81c285
  	compatible_set();
Karsten Hopp 81c285
      }
Karsten Hopp 81c285
  
Karsten Hopp 81c285
+     /* 'list', 'number' */
Karsten Hopp 81c285
+     else if ((int *)varp == &curwin->w_p_list
Karsten Hopp 81c285
+ 	  || (int *)varp == &curwin->w_p_nu)
Karsten Hopp 81c285
+     {
Karsten Hopp 81c285
+ 	if (curwin->w_curswant != MAXCOL)
Karsten Hopp 81c285
+ 	    curwin->w_set_curswant = TRUE;
Karsten Hopp 81c285
+     }
Karsten Hopp 81c285
+ 
Karsten Hopp 81c285
      else if ((int *)varp == &curbuf->b_p_ro)
Karsten Hopp 81c285
      {
Karsten Hopp 81c285
  	/* when 'readonly' is reset globally, also reset readonlymode */
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 7645,7650 ****
Karsten Hopp 81c285
--- 7653,7666 ----
Karsten Hopp 81c285
  	    curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
Karsten Hopp 81c285
  # endif
Karsten Hopp 81c285
  	}
Karsten Hopp 81c285
+ 	if (curwin->w_curswant != MAXCOL)
Karsten Hopp 81c285
+ 	    curwin->w_set_curswant = TRUE;
Karsten Hopp 81c285
+     }
Karsten Hopp 81c285
+ 
Karsten Hopp 81c285
+     else if ((int *)varp == &p_arshape)
Karsten Hopp 81c285
+     {
Karsten Hopp 81c285
+ 	if (curwin->w_curswant != MAXCOL)
Karsten Hopp 81c285
+ 	    curwin->w_set_curswant = TRUE;
Karsten Hopp 81c285
      }
Karsten Hopp 81c285
  #endif
Karsten Hopp 81c285
  
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 7655,7662 ****
Karsten Hopp 81c285
      options[opt_idx].flags |= P_WAS_SET;
Karsten Hopp 81c285
  
Karsten Hopp 81c285
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
Karsten Hopp 81c285
!     if (curwin->w_curswant != MAXCOL)
Karsten Hopp 81c285
! 	curwin->w_set_curswant = TRUE;  /* in case 'list' changed */
Karsten Hopp 81c285
      check_redraw(options[opt_idx].flags);
Karsten Hopp 81c285
  
Karsten Hopp 81c285
      return NULL;
Karsten Hopp 81c285
--- 7671,7677 ----
Karsten Hopp 81c285
      options[opt_idx].flags |= P_WAS_SET;
Karsten Hopp 81c285
  
Karsten Hopp 81c285
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
Karsten Hopp 81c285
! 
Karsten Hopp 81c285
      check_redraw(options[opt_idx].flags);
Karsten Hopp 81c285
  
Karsten Hopp 81c285
      return NULL;
Karsten Hopp 81c285
*** ../vim-7.2.241/src/version.c	2009-07-29 12:09:49.000000000 +0200
Karsten Hopp 81c285
--- src/version.c	2009-07-29 15:40:43.000000000 +0200
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 678,679 ****
Karsten Hopp 81c285
--- 678,681 ----
Karsten Hopp 81c285
  {   /* Add new patch number below this line */
Karsten Hopp 81c285
+ /**/
Karsten Hopp 81c285
+     242,
Karsten Hopp 81c285
  /**/
Karsten Hopp 81c285
Karsten Hopp 81c285
-- 
Karsten Hopp 81c285
hundred-and-one symptoms of being an internet addict:
Karsten Hopp 81c285
117. You are more comfortable typing in html.
Karsten Hopp 81c285
Karsten Hopp 81c285
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 81c285
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 81c285
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 81c285
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///