diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-13 11:23:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-13 11:23:50 +0100 |
| commit | 488eb26ec7fda1dc79f3d856d40da072332630b6 (patch) | |
| tree | 3d3aa2e5182ab8024ceb29dd651024f963d95510 | |
| parent | 0f8dd840fc6a614450db60ebe405d6201a2ecc3e (diff) | |
| download | vim-git-488eb26ec7fda1dc79f3d856d40da072332630b6.tar.gz | |
updated for version 7.4.659v7.4.659
Problem: When 'ruler' is set the preferred column is reset. (Issue 339)
Solution: Don't set curswant when redrawing the status lines.
| -rw-r--r-- | src/option.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/option.c b/src/option.c index d9cfda0f0..6b3b00caa 100644 --- 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 6e579e0c1..21a910d70 100644 --- 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, |