diff --git a/src/option.c b/src/option.c index bd19916146..08e555bcff 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 b5698aac1b..ce312d4a8c 100644 --- a/src/version.c +++ b/src/version.c @@ -666,6 +666,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 43, /**/ 42, /**/