patch 9.0.1081: using "->" with split lines does not always work
Problem: Using "->" with split lines does not always work.
Solution: Avoid trying to get another line. (closes #11723)
diff --git a/src/eval.c b/src/eval.c
index 934d640..94bb4e3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4548,11 +4548,19 @@
if (**arg != '(' && alias == NULL
&& (paren = vim_strchr(*arg, '(')) != NULL)
{
- char_u *deref;
-
*arg = name;
+
+ // Truncate the name a the "(". Avoid trying to get another line
+ // by making "getline" NULL.
*paren = NUL;
- deref = deref_function_name(arg, &tofree, evalarg, verbose);
+ char_u *(*getline)(int, void *, int, getline_opt_T) = NULL;
+ if (evalarg != NULL)
+ {
+ getline = evalarg->eval_getline;
+ evalarg->eval_getline = NULL;
+ }
+
+ char_u *deref = deref_function_name(arg, &tofree, evalarg, verbose);
if (deref == NULL)
{
*arg = name + len;
@@ -4563,7 +4571,10 @@
name = deref;
len = (long)STRLEN(name);
}
+
*paren = '(';
+ if (getline != NULL)
+ evalarg->eval_getline = getline;
}
if (ret == OK)