From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 21 Jan 2011 23:58:20 +0000 (+0100)
Subject: updated for version 7.3.104
X-Git-Tag: v7.3.104
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4124e7237376fb50a03b6305bcdb4287ecdfd4e8;p=thirdparty%2Fvim.git

updated for version 7.3.104
Problem:    Conceal: using Tab for cchar causes problems. (ZyX)
Solution:   Do not accept a control character for cchar.
---

diff --git a/src/syntax.c b/src/syntax.c
index d2a99a4f79..369311fb74 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -4537,6 +4537,13 @@ get_syn_options(arg, opt, conceal_char)
 		;
 #endif
 	    }
+#ifdef FEAT_CONCEAL
+	    if (!vim_isprintc_strict(*conceal_char))
+	    {
+		EMSG(_("E844: invalid cchar value"));
+		return NULL;
+	    }
+#endif
 	    arg = skipwhite(arg + 7);
 	}
 	else
diff --git a/src/version.c b/src/version.c
index 107cdea693..1cb55bfec1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    104,
 /**/
     103,
 /**/