aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.659

Browse Source 
Problem:    When 'ruler' is set the preferred column is reset. (Issue 339)
Solution:   Don't set curswant when redrawing the status lines.
This commit is contained in:
Bram Moolenaar 2015-03-13 11:23:50 +01:00
parent 0f8dd840fc
commit 488eb26ec7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/option.c
View File

@ -7193,7 +7193,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
#endif #endif
if (curwin->w_curswant != MAXCOL 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; curwin->w_set_curswant = TRUE;
#ifdef FEAT_GUI #ifdef FEAT_GUI
@ -8203,7 +8203,7 @@ set_bool_option(opt_idx, varp, value, opt_flags)
comp_col(); /* in case 'ruler' or 'showcmd' changed */ comp_col(); /* in case 'ruler' or 'showcmd' changed */
if (curwin->w_curswant != MAXCOL 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; curwin->w_set_curswant = TRUE;
check_redraw(options[opt_idx].flags); 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 */ comp_col(); /* in case 'columns' or 'ls' changed */
if (curwin->w_curswant != MAXCOL 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; curwin->w_set_curswant = TRUE;
check_redraw(options[opt_idx].flags); check_redraw(options[opt_idx].flags);

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
659,
/**/ /**/
658, 658,
/**/ /**/