summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 fae10b6a2..7356816b6 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 02d1be454..152d4d87c 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,