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
commit2722f680122740323e93f017f8da8d25b3800a15 (patch)
tree323ce12aee812f060a499827843cf44be7e02864
parent061654804a0f1a3e7814a6a81266e70158389126 (diff)
downloadvim-7-3-104.tar.gz
updated for version 7.3.104v7.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 d2a99a4f..369311fb 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 107cdea6..1cb55bfe 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,