summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2014-02-05 22:13:05 +0100
committerBram Moolenaar <bram@vim.org>2014-02-05 22:13:05 +0100
commit14e88c171a2283e3acb65f2d9f81b63c5fdfc174 (patch)
tree23da72e21b96bc9500ed0de3ff0222e5ad060499
parent5d73e4b6c4ad6289dc3fa7b3a9a0b2b5e0ecc89b (diff)
downloadvim-14e88c171a2283e3acb65f2d9f81b63c5fdfc174.tar.gz
updated for version 7.4.166v7.4.166v7-4-166
Problem: Auto-loading a function for code that won't be executed. Solution: Do not auto-load when evaluation is off. (Yasuhiro Matsumoto)
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 3786adfd..65a947bb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5159,7 +5159,7 @@ eval7(arg, rettv, evaluate, want_string)
{
/* If "s" is the name of a variable of type VAR_FUNC
* use its contents. */
- s = deref_func_name(s, &len, FALSE);
+ s = deref_func_name(s, &len, !evaluate);
/* Invoke the function. */
ret = get_func_tv(s, len, rettv, arg,
diff --git a/src/version.c b/src/version.c
index 821feb94..3e6282a4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 166,
+/**/
165,
/**/
164,