From 98b3dc0571603f07f3e81babe402bb0837fc619b Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 27 Apr 2015 22:08:14 -0400 Subject: vim-patch:7.4.659 + test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: When 'ruler' is set the preferred column is reset. (Issue 339) Solution: Don't set curswant when redrawing the status lines. https://code.google.com/p/vim/source/detail?r=v7-4-659 Helped-by: David Bürgin <676c7473@gmail.com> Based on #2347 by @pvinis --- src/nvim/option.c | 6 +++--- src/nvim/version.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/nvim/option.c b/src/nvim/option.c index 1a7d161c62..33e3f5b459 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4347,7 +4347,7 @@ did_set_string_option ( } 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); @@ -4988,7 +4988,7 @@ set_bool_option ( 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); @@ -5360,7 +5360,7 @@ set_num_option ( 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/nvim/version.c b/src/nvim/version.c index 5758619b56..76460959ed 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -124,7 +124,7 @@ static int included_patches[] = { //662, //661, 660, - //659, + 659, //658, //657, //656, -- cgit