summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2006-08-08 14:29:16 +0000
committervimboss <devnull@localhost>2006-08-08 14:29:16 +0000
commit1198cd6a84e19590999b28302a599cb1b9a8db8d (patch)
tree7a7be6dbca39b11b10e3a879fd66b9f5adaee7d3
parent4247583f850db03ac1467819ad03e61071d15bf1 (diff)
downloadvim-1198cd6a84e19590999b28302a599cb1b9a8db8d.tar.gz
updated for version 7.0-043v7.0.043v7-0-043
-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 bd199161..08e555bc 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 b5698aac..ce312d4a 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,