summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-22 14:19:56 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-22 14:19:56 +0200
commitcbc67723bde3c05e4bc0788457961b41304576ee (patch)
tree130117a243376a09e5e156af3b504a1adf7192ba
parent050fe7ebad159f48704bd3a991632d0330ef0cf2 (diff)
updated for version 7.4.298v7.4.298
Problem: Can't have a funcref start with "t:". Solution: Add "t" to the list of accepted names. (Yukihiro Nakadaira)
-rw-r--r--src/eval.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 6ba2dd8aa5..bc7f22ad71 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21064,7 +21064,8 @@ var_check_func_name(name, new_var)
char_u *name; /* points to start of variable name */
int new_var; /* TRUE when creating the variable */
{
- if (!(vim_strchr((char_u *)"wbs", name[0]) != NULL && name[1] == ':')
+ /* Allow for w: b: s: and t:. */
+ if (!(vim_strchr((char_u *)"wbst", name[0]) != NULL && name[1] == ':')
&& !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
? name[2] : name[0]))
{
diff --git a/src/version.c b/src/version.c
index 40e967dfe5..1a1755efa8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 298,
+/**/
297,
/**/
296,