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
index d9cfda0f0d2ede775a76734bc7ba5f63a1f20c40..6b3b00caa335a8c7dd33dae47d8b397314e4d2a3 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -7193,7 +7193,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 #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, opt_flags)
 
     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, errbuf, errbuflen, opt_flags)
 
     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
index 6e579e0c1b5ce49860c6291b1aaf91c981f9d880..21a910d702b64927107dc2185985d0798d33f6ac 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    659,
 /**/
     658,
 /**/