summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-01-22 00:58:20 +0100
committerBram Moolenaar <Bram@vim.org>2011-01-22 00:58:20 +0100
commit4124e7237376fb50a03b6305bcdb4287ecdfd4e8 (patch)
treefff83d286f756b105432e7321c3447048d10faa0
parent164c60f5b1042419698ca7758bb2e32ed77bdede (diff)
downloadvim-git-4124e7237376fb50a03b6305bcdb4287ecdfd4e8.tar.gz
updated for version 7.3.104v7.3.104
Problem: Conceal: using Tab for cchar causes problems. (ZyX) Solution: Do not accept a control character for cchar.
-rw-r--r--src/syntax.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index d2a99a4f7..369311fb7 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 107cdea69..1cb55bfec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 104,
+/**/
103,
/**/
102,