# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1426242230 -3600
# Node ID 5a12a68613670ddb7d3be0c693738400c61ef24b
# Parent  03e6a768a028978e269212cb99dfb40245d76861
updated for version 7.4.659
Problem:    When 'ruler' is set the preferred column is reset. (Issue 339)
Solution:   Don't set curswant when redrawing the status lines.

diff --git a/src/option.c b/src/option.c
--- a/src/option.c
+++ b/src/option.c
@@ -7193,7 +7193,7 @@ did_set_string_option(opt_idx, varp, new
 #endif
 
     if (curwin->w_curswant != MAXCOL
-		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
 	curwin->w_set_curswant = TRUE;
 
 #ifdef FEAT_GUI
@@ -8203,7 +8203,7 @@ set_bool_option(opt_idx, varp, value, op
 
     comp_col();			    /* in case 'ruler' or 'showcmd' changed */
     if (curwin->w_curswant != MAXCOL
-		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
 	curwin->w_set_curswant = TRUE;
     check_redraw(options[opt_idx].flags);
 
@@ -8738,7 +8738,7 @@ set_num_option(opt_idx, varp, value, err
 
     comp_col();			    /* in case 'columns' or 'ls' changed */
     if (curwin->w_curswant != MAXCOL
-		     && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+		     && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
 	curwin->w_set_curswant = TRUE;
     check_redraw(options[opt_idx].flags);
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    659,
+/**/
     658,
 /**/
     657,