diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-04-01 13:35:21 -0400 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-02 18:54:36 -0300 |
commit | 0895bf88282155f12ee464de16fed01b7c159fab (patch) | |
tree | f7bab9c2b4729fcbdc131e0c7cff8a816688de18 /src | |
parent | c298edd5dc2484d41ea4620d1d0172042b647a36 (diff) | |
download | rneovim-0895bf88282155f12ee464de16fed01b7c159fab.tar.gz rneovim-0895bf88282155f12ee464de16fed01b7c159fab.tar.bz2 rneovim-0895bf88282155f12ee464de16fed01b7c159fab.zip |
vim-patch:7.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)
https://code.google.com/p/vim/source/detail?r=5d03c374712128077ac4c342aad02120ed98df70
Diffstat (limited to 'src')
-rw-r--r-- | src/eval.c | 2 | ||||
-rw-r--r-- | src/version.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index f7bc70fc17..e29853a1b5 100644 --- a/src/eval.c +++ b/src/eval.c @@ -4514,7 +4514,7 @@ eval7 ( if (**arg == '(') { /* recursive! */ /* 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 fe058d94e6..f7d21c26a1 100644 --- a/src/version.c +++ b/src/version.c @@ -221,6 +221,12 @@ static char *(features[]) = { static int included_patches[] = { // Add new patch number below this line + 166, + //165, + //164, + //163, + //162, + //161, 160, 159, 158, |