summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-09-06 12:26:44 +0000
committerBram Moolenaar <Bram@vim.org>2007-09-06 12:26:44 +0000
commit33e1a80f84718828fd83c13638b3022eb5b38ad3 (patch)
tree644678e86627d9f9fcd09aa06ca0af137694edca
parent177d8c60ee214b53aeef580a8614247989c0de09 (diff)
updated for version 7.1-098v7.1.098
-rw-r--r--src/eval.c22
-rw-r--r--src/version.c2
2 files changed, 24 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 77d641374e..69f3af8cee 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -19371,6 +19371,28 @@ trans_function_name(pp, skip, flags, fdp)
goto theend;
}
+ /* Check if the name is a Funcref. If so, use the value. */
+ if (lv.ll_exp_name != NULL)
+ {
+ len = (int)STRLEN(lv.ll_exp_name);
+ name = deref_func_name(lv.ll_exp_name, &len);
+ if (name == lv.ll_exp_name)
+ name = NULL;
+ }
+ else
+ {
+ len = (int)(end - *pp);
+ name = deref_func_name(*pp, &len);
+ if (name == *pp)
+ name = NULL;
+ }
+ if (name != NULL)
+ {
+ name = vim_strsave(name);
+ *pp = end;
+ goto theend;
+ }
+
if (lv.ll_exp_name != NULL)
{
len = (int)STRLEN(lv.ll_exp_name);
diff --git a/src/version.c b/src/version.c
index b39a4d996f..20c5be33b4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 98,
+/**/
97,
/**/
96,