summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2009-07-29 13:42:05 +0000
committervimboss <devnull@localhost>2009-07-29 13:42:05 +0000
commit7b648dcb626f98f9a2987104cfcd84a5b1d8df44 (patch)
treeb45a1c6157500b876a3fa589a7527d8340e874db
parent90d289306b1b67e451b53de3de8c4ba427f4c41a (diff)
downloadvim-7b648dcb626f98f9a2987104cfcd84a5b1d8df44.tar.gz
updated for version 7.2-242v7.2.242v7-2-242
-rw-r--r--src/option.c19
-rw-r--r--src/version.c2
2 files changed, 19 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index a400eb6f..0f69322c 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7194,6 +7194,14 @@ set_bool_option(opt_idx, varp, value, opt_flags)
compatible_set();
}
+ /* 'list', 'number' */
+ else if ((int *)varp == &curwin->w_p_list
+ || (int *)varp == &curwin->w_p_nu)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+
else if ((int *)varp == &curbuf->b_p_ro)
{
/* when 'readonly' is reset globally, also reset readonlymode */
@@ -7645,6 +7653,14 @@ set_bool_option(opt_idx, varp, value, opt_flags)
curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
# endif
}
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+
+ else if ((int *)varp == &p_arshape)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
}
#endif
@@ -7655,8 +7671,7 @@ set_bool_option(opt_idx, varp, value, opt_flags)
options[opt_idx].flags |= P_WAS_SET;
comp_col(); /* in case 'ruler' or 'showcmd' changed */
- if (curwin->w_curswant != MAXCOL)
- curwin->w_set_curswant = TRUE; /* in case 'list' changed */
+
check_redraw(options[opt_idx].flags);
return NULL;
diff --git a/src/version.c b/src/version.c
index 2b2431bc..c762648b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 242,
+/**/
241,
/**/
240,