updated for version 7.2-242

diff --git a/src/option.c b/src/option.c
index a400eb6f3e032422140c7ca7744051fed63ab0b3..0f69322c281459f79bed0d271bdee4761c7239c9 100644 (file)
--- 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 2b2431bc845db557304262c5370722ef31e671c6..c762648b31c32ba8466083b76b5c9e7209f02285 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    242,
 /**/
     241,
 /**/