summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-09-06 11:33:37 +0000
committerBram Moolenaar <Bram@vim.org>2007-09-06 11:33:37 +0000
commit177d8c60ee214b53aeef580a8614247989c0de09 (patch)
treeb0b6e9828c77ef3b6e8c9244aee7c766a0ec74b0
parentc27c8d5c5915650d5d1a4c1b37b39cd6d28e3f76 (diff)
updated for version 7.1-097v7.1.097
-rw-r--r--src/option.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index d02605ccf6..893f1457cc 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6348,7 +6348,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
errmsg = check_stl_option(p_ruf);
}
/* check 'statusline' only if it doesn't start with "%!" */
- else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
+ else if (varp == &p_ruf || s[0] != '%' || s[1] != '!')
errmsg = check_stl_option(s);
if (varp == &p_ruf && errmsg == NULL)
comp_col();
diff --git a/src/version.c b/src/version.c
index e1fc310cb3..b39a4d996f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 97,
+/**/
96,
/**/
95,