aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

updated for version 7.4.154

Browse Source 
Problem:    Still a problem with auto-loading.
Solution:   Pass no_autoload to deref_func_name(). (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar
2014-01-14 19:44:34 +01:00
parent 5395e7afe9
commit 8822a9c367
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/eval.c
View File

@@ -447,7 +447,7 @@ static int string2float __ARGS((char_u *text, float_T *value));
#endif #endif
static int get_env_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate)); static int get_env_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));
static int find_internal_func __ARGS((char_u *name)); static int find_internal_func __ARGS((char_u *name));
static char_u *deref_func_name __ARGS((char_u *name, int *lenp)); static char_u *deref_func_name __ARGS((char_u *name, int *lenp, int no_autoload));
static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); static int get_func_tv __ARGS((char_u *name, int len, typval_T *rettv, char_u **arg, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
static int call_func __ARGS((char_u *funcname, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict)); static int call_func __ARGS((char_u *funcname, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
static void emsg_funcname __ARGS((char *ermsg, char_u *name)); static void emsg_funcname __ARGS((char *ermsg, char_u *name));
@@ -3432,7 +3432,7 @@ ex_call(eap)
/* If it is the name of a variable of type VAR_FUNC use its contents. */ /* If it is the name of a variable of type VAR_FUNC use its contents. */
len = (int)STRLEN(tofree); len = (int)STRLEN(tofree);
name = deref_func_name(tofree, &len); name = deref_func_name(tofree, &len, FALSE);
/* Skip white space to allow ":call func ()". Not good, but required for /* Skip white space to allow ":call func ()". Not good, but required for
* backward compatibility. */ * backward compatibility. */
@@ -5159,7 +5159,7 @@ eval7(arg, rettv, evaluate, want_string)
{ {
/* If "s" is the name of a variable of type VAR_FUNC /* If "s" is the name of a variable of type VAR_FUNC
* use its contents. */ * use its contents. */
s = deref_func_name(s, &len); s = deref_func_name(s, &len, FALSE);
/* Invoke the function. */ /* Invoke the function. */
ret = get_func_tv(s, len, rettv, arg, ret = get_func_tv(s, len, rettv, arg,
@@ -8291,16 +8291,17 @@ find_internal_func(name)
* name it contains, otherwise return "name". * name it contains, otherwise return "name".
*/ */
static char_u * static char_u *
deref_func_name(name, lenp) deref_func_name(name, lenp, no_autoload)
char_u *name; char_u *name;
int *lenp; int *lenp;
int no_autoload;
{ {
dictitem_T *v; dictitem_T *v;
int cc; int cc;
cc = name[*lenp]; cc = name[*lenp];
name[*lenp] = NUL; name[*lenp] = NUL;
v = find_var(name, NULL, FALSE); v = find_var(name, NULL, no_autoload);
name[*lenp] = cc; name[*lenp] = cc;
if (v != NULL && v->di_tv.v_type == VAR_FUNC) if (v != NULL && v->di_tv.v_type == VAR_FUNC)
{ {
@@ -21947,14 +21948,14 @@ trans_function_name(pp, skip, flags, fdp)
if (lv.ll_exp_name != NULL) if (lv.ll_exp_name != NULL)
{ {
len = (int)STRLEN(lv.ll_exp_name); len = (int)STRLEN(lv.ll_exp_name);
name = deref_func_name(lv.ll_exp_name, &len); name = deref_func_name(lv.ll_exp_name, &len, flags & TFN_NO_AUTOLOAD);
if (name == lv.ll_exp_name) if (name == lv.ll_exp_name)
name = NULL; name = NULL;
} }
else else
{ {
len = (int)(end - *pp); len = (int)(end - *pp);
name = deref_func_name(*pp, &len); name = deref_func_name(*pp, &len, flags & TFN_NO_AUTOLOAD);
if (name == *pp) if (name == *pp)
name = NULL; name = NULL;
} }

2
src/version.c
View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
154,
/**/ /**/
153, 153,
/**/ /**/