summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-11 13:20:33 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-11 13:20:33 +0000
commit319bdbd5ef1de87fac5e7725d17ba411c5537c5a (patch)
tree50ada2ab58e7fadc8eb9abca4878f66515957ab6
parentc06620266577d01609a6595d1aaff783f63cdcb0 (diff)
downloadvim-git-319bdbd5ef1de87fac5e7725d17ba411c5537c5a.tar.gz
updated for version 7.2-255v7.2.255
-rw-r--r--src/option.c18
-rw-r--r--src/version.c2
2 files changed, 20 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 0f69322c2..d680cfb1f 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7430,6 +7430,8 @@ set_bool_option(opt_idx, varp, value, opt_flags)
{
if (curwin->w_p_wrap)
curwin->w_leftcol = 0;
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
}
#ifdef FEAT_WINDOWS
@@ -7664,6 +7666,22 @@ set_bool_option(opt_idx, varp, value, opt_flags)
}
#endif
+#ifdef FEAT_LINEBREAK
+ if ((int *)varp == &curwin->w_p_lbr)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+#endif
+
+#ifdef FEAT_RIGHTLEFT
+ if ((int *)varp == &curwin->w_p_rl)
+ {
+ if (curwin->w_curswant != MAXCOL)
+ curwin->w_set_curswant = TRUE;
+ }
+#endif
+
/*
* End of handling side effects for bool options.
*/
diff --git a/src/version.c b/src/version.c
index 612f71564..17a4d5f8f 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 */
/**/
+ 255,
+/**/
254,
/**/
253,