Karsten Hopp 12782b
To: vim_dev@googlegroups.com
Karsten Hopp 12782b
Subject: Patch 7.4.659
Karsten Hopp 12782b
Fcc: outbox
Karsten Hopp 12782b
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 12782b
Mime-Version: 1.0
Karsten Hopp 12782b
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 12782b
Content-Transfer-Encoding: 8bit
Karsten Hopp 12782b
------------
Karsten Hopp 12782b
Karsten Hopp 12782b
Patch 7.4.659
Karsten Hopp 12782b
Problem:    When 'ruler' is set the preferred column is reset. (Issue 339)
Karsten Hopp 12782b
Solution:   Don't set curswant when redrawing the status lines.
Karsten Hopp 12782b
Files:	    src/option.c
Karsten Hopp 12782b
Karsten Hopp 12782b
Karsten Hopp 12782b
*** ../vim-7.4.658/src/option.c	2015-02-10 19:20:33.731792076 +0100
Karsten Hopp 12782b
--- src/option.c	2015-03-13 11:19:50.564937256 +0100
Karsten Hopp 12782b
***************
Karsten Hopp 12782b
*** 7193,7199 ****
Karsten Hopp 12782b
  #endif
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
  
Karsten Hopp 12782b
  #ifdef FEAT_GUI
Karsten Hopp 12782b
--- 7193,7199 ----
Karsten Hopp 12782b
  #endif
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
  
Karsten Hopp 12782b
  #ifdef FEAT_GUI
Karsten Hopp 12782b
***************
Karsten Hopp 12782b
*** 8203,8209 ****
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
      check_redraw(options[opt_idx].flags);
Karsten Hopp 12782b
  
Karsten Hopp 12782b
--- 8203,8209 ----
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      comp_col();			    /* in case 'ruler' or 'showcmd' changed */
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
      check_redraw(options[opt_idx].flags);
Karsten Hopp 12782b
  
Karsten Hopp 12782b
***************
Karsten Hopp 12782b
*** 8738,8744 ****
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      comp_col();			    /* in case 'columns' or 'ls' changed */
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
      check_redraw(options[opt_idx].flags);
Karsten Hopp 12782b
  
Karsten Hopp 12782b
--- 8738,8744 ----
Karsten Hopp 12782b
  
Karsten Hopp 12782b
      comp_col();			    /* in case 'columns' or 'ls' changed */
Karsten Hopp 12782b
      if (curwin->w_curswant != MAXCOL
Karsten Hopp 12782b
! 		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
Karsten Hopp 12782b
  	curwin->w_set_curswant = TRUE;
Karsten Hopp 12782b
      check_redraw(options[opt_idx].flags);
Karsten Hopp 12782b
  
Karsten Hopp 12782b
*** ../vim-7.4.658/src/version.c	2015-03-08 14:48:32.959696341 +0100
Karsten Hopp 12782b
--- src/version.c	2015-03-13 11:21:31.255788185 +0100
Karsten Hopp 12782b
***************
Karsten Hopp 12782b
*** 743,744 ****
Karsten Hopp 12782b
--- 743,746 ----
Karsten Hopp 12782b
  {   /* Add new patch number below this line */
Karsten Hopp 12782b
+ /**/
Karsten Hopp 12782b
+     659,
Karsten Hopp 12782b
  /**/
Karsten Hopp 12782b
Karsten Hopp 12782b
-- 
Karsten Hopp 12782b
"A mouse can be just as dangerous as a bullet or a bomb."
Karsten Hopp 12782b
             (US Representative Lamar Smith, R-Texas)
Karsten Hopp 12782b
Karsten Hopp 12782b
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 12782b
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 12782b
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 12782b
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///