summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-29 22:10:48 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-29 22:10:48 +0100
commit0945eaface83e78138fbd40f95cc590bab0e8c86 (patch)
treea34026b88e9d23217c09046bd00877034f65970e
parent4b785f69c0616dba5d3f38e8ce4b5398cec89407 (diff)
patch 8.0.0106v8.0.0106
Problem: Cannot use a semicolon in 'backupext'. (Jeff) Solution: Allow for a few more characters when "secure" isn't set.
-rw-r--r--src/option.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index fae10b6a2e..7356816b6b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5879,9 +5879,11 @@ did_set_string_option(
/* Check for a "normal" directory or file name in some options. Disallow a
* path separator (slash and/or backslash), wildcards and characters that
- * are often illegal in a file name. */
+ * are often illegal in a file name. Be more permissive if "secure" is off.
+ */
else if (((options[opt_idx].flags & P_NFNAME)
- && vim_strpbrk(*varp, (char_u *)"/\\*?[|;&<>\r\n") != NULL)
+ && vim_strpbrk(*varp, (char_u *)(secure
+ ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL)
|| ((options[opt_idx].flags & P_NDNAME)
&& vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL))
{
diff --git a/src/version.c b/src/version.c
index 02d1be454b..152d4d87c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 106,
+/**/
105,
/**/
104,