diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-12 13:37:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-12 13:37:43 +0200 |
| commit | 60bf1f58d0edc45582fa065c3e0f68ae0de637ee (patch) | |
| tree | 0f902ca9ab2edf415afecd1663d1b6aff71a27eb | |
| parent | a2947e2bea0e6084a76d5ba7a5a1203da39e0f4b (diff) | |
updated for version 7.3.1170v7.3.1170
Problem: Patch 7.3.1058 breaks backwards compatibility, not possible to use
a function reference as a string. (lilydjwg)
Solution: Instead of translating the function name only translate "s:".
| -rw-r--r-- | src/eval.c | 30 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 21 insertions, 11 deletions
diff --git a/src/eval.c b/src/eval.c index 81c3ca278a..4e4bbc04e6 100644 --- a/src/eval.c +++ b/src/eval.c @@ -10962,25 +10962,33 @@ f_function(argvars, rettv) typval_T *rettv; { char_u *s; - char_u *name = NULL; s = get_tv_string(&argvars[0]); if (s == NULL || *s == NUL || VIM_ISDIGIT(*s)) EMSG2(_(e_invarg2), s); - /* Don't check an autoload name for existence here, but still expand it - * checking for validity */ - else if ((name = get_expanded_name(s, vim_strchr(s, AUTOLOAD_CHAR) == NULL)) - == NULL) + /* Don't check an autoload name for existence here. */ + else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s)) EMSG2(_("E700: Unknown function: %s"), s); else { - if (name == NULL) - /* Autoload function, need to copy string */ - rettv->vval.v_string = vim_strsave(s); + if (STRNCMP(s, "s:", 2) == 0) + { + char sid_buf[25]; + + /* Expand s: into <SNR>nr_, so that the function can also be + * called from another script. Using trans_function_name() would + * also work, but some plugins depend on the name being printable + * text. */ + sprintf(sid_buf, "<SNR>%ld_", (long)current_SID); + rettv->vval.v_string = alloc(STRLEN(sid_buf) + STRLEN(s + 2) + 1); + if (rettv->vval.v_string != NULL) + { + STRCPY(rettv->vval.v_string, sid_buf); + STRCAT(rettv->vval.v_string, s + 2); + } + } else - /* Function found by get_expanded_name, string allocated by - * trans_function_name: no need to copy */ - rettv->vval.v_string = name; + rettv->vval.v_string = vim_strsave(s); rettv->v_type = VAR_FUNC; } } diff --git a/src/version.c b/src/version.c index 2996bad11c..e20ac7f41f 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1170, +/**/ 1169, /**/ 1168, |