updated for version 7.1-084

diff --git a/src/charset.c b/src/charset.c
index 5a2952cd6c4eb6e9ae24853ae7d61d8cb883ecde..32d755532537282b4e8ae978792c664a6ceb070d 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -931,6 +931,23 @@ vim_isfilec(c)
     return (c >= 0x100 || (c > 0 && (chartab[c] & CT_FNAME_CHAR)));
 }
 
+/*
+ * return TRUE if 'c' is a valid file-name character or a wildcard character
+ * Assume characters above 0x100 are valid (multi-byte).
+ * Explicitly interpret ']' as a wildcard character as mch_has_wildcard("]")
+ * returns false.
+ */
+    int
+vim_isfilec_or_wc(c)
+    int c;
+{
+    char_u buf[2];
+
+    buf[0] = (char_u)c;
+    buf[1] = NUL;
+    return vim_isfilec(c) || c == ']' || mch_has_wildcard(buf);
+}
+
 /*
  * return TRUE if 'c' is a printable character
  * Assume characters above 0x100 are printable (multi-byte), except for

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 46671dca0ab9a1d253bc38620fbd76092f7b35e2..1b2672fd284e846a7bb64a90e35b7cd65098fca1 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3776,7 +3776,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
            workshop_file_opened((char *)curbuf->b_ffname, curbuf->b_p_ro);
 # endif
 # ifdef FEAT_NETBEANS_INTG
-       if (usingNetbeans & ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
+       if (usingNetbeans && ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
            netbeans_file_opened(curbuf);
 # endif
     }

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 73a990c7259042b7eb4e1baf5bd8844fb5715f92..0b33e7994d1b92e69b047a72aa0d79a884d6c60c 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3311,9 +3311,10 @@ set_one_cmd_context(xp, buff)
                in_quote = !in_quote;
            }
 #ifdef SPACE_IN_FILENAME
-           else if (!vim_isfilec(c) && (!(ea.argt & NOSPC) || usefilter))
+           else if (!vim_isfilec_or_wc(c)
+                                        && (!(ea.argt & NOSPC) || usefilter))
 #else
-           else if (!vim_isfilec(c))
+           else if (!vim_isfilec_or_wc(c))
 #endif
            {
                while (*p != NUL)
@@ -3324,7 +3325,7 @@ set_one_cmd_context(xp, buff)
                    else
 #endif
                        c = *p;
-                   if (c == '`' || vim_isfilec(c))
+                   if (c == '`' || vim_isfilec_or_wc(c))
                        break;
 #ifdef FEAT_MBYTE
                    if (has_mbyte)

diff --git a/src/proto/charset.pro b/src/proto/charset.pro
index 4b6890d18bd32c6c2e978b6bc534e41e0fadaa26..ff0c45c2719b5c8bdb61bcbc337b7a70f510194b 100644 (file)
--- a/src/proto/charset.pro
+++ b/src/proto/charset.pro
@@ -21,6 +21,7 @@ int vim_iswordc __ARGS((int c));
 int vim_iswordp __ARGS((char_u *p));
 int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf));
 int vim_isfilec __ARGS((int c));
+int vim_isfilec_or_wc __ARGS((int c));
 int vim_isprintc __ARGS((int c));
 int vim_isprintc_strict __ARGS((int c));
 int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col));

diff --git a/src/version.c b/src/version.c
index a283015020ce0fcb5af5c0d8676dd29db2066bfe..2b04ff4365ba1c51e4bc6d81b672f32f290abc16 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    84,
+/**/
+    83,
 /**/
     82,
 /**/