From 308f0eecac05baa127e3a35a08d7a4cd08003b86 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 13 Mar 2015 11:23:50 +0100 Subject: [PATCH] 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. --- src/option.c | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/option.c b/src/option.c index 09a328c42d..84c81bcae3 100644 --- a/src/option.c +++ b/src/option.c @@ -7280,7 +7280,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 @@ -8327,7 +8327,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); @@ -8876,7 +8876,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 a15c493e8d..27a324d304 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 659, /**/ 658, /**/