updated for version 7.3.1063
Problem: Python: Function is not standard.
Solution: Python patch 22: make Function subclassable. (ZyX)
diff --git a/src/eval.c b/src/eval.c
index 25785b7..06cf488 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -21933,6 +21933,15 @@
}
#endif
+ int
+translated_function_exists(name)
+ char_u *name;
+{
+ if (builtin_function(name))
+ return find_internal_func(name) >= 0;
+ return find_func(name) != NULL;
+}
+
/*
* Return TRUE if a function "name" exists.
*/
@@ -21950,12 +21959,7 @@
/* Only accept "funcname", "funcname ", "funcname (..." and
* "funcname(...", not "funcname!...". */
if (p != NULL && (*nm == NUL || *nm == '('))
- {
- if (builtin_function(p))
- n = (find_internal_func(p) >= 0);
- else
- n = (find_func(p) != NULL);
- }
+ n = translated_function_exists(p);
vim_free(p);
return n;
}
@@ -21971,18 +21975,9 @@
p = trans_function_name(&nm, FALSE, TFN_INT|TFN_QUIET, NULL);
if (p != NULL && *nm == NUL)
- {
- if (!check)
+ if (!check || translated_function_exists(p))
return p;
- else if (builtin_function(p))
- {
- if (find_internal_func(p) >= 0)
- return p;
- }
- else
- if (find_func(p) != NULL)
- return p;
- }
+
vim_free(p);
return NULL;
}