summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-08 14:29:16 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-08 14:29:16 +0000
commit3709e7c885c178863a6c31300b3bda2145442a59 (patch)
tree7a7be6dbca39b11b10e3a879fd66b9f5adaee7d3 /src
parent12dec75f7170a66ff60aa4e98fd4ae98657f2b07 (diff)
downloadvim-3709e7c885c178863a6c31300b3bda2145442a59.zip
updated for version 7.0-043
Diffstat (limited to 'src')
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index bd1991614..08e555bcf 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6325,7 +6325,8 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
else
errmsg = check_stl_option(p_ruf);
}
- else
+ /* check 'statusline' only if it doesn't start with "%!" */
+ else if (varp != &p_stl || 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 b5698aac1..ce312d4a8 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 */
/**/
+ 43,
+/**/
42,
/**/
41,