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

updated for version 7.3.1187

Browse Source 
Problem:    "s:" is recognized but "<SID>" is not. (ZyX)
Solution:   Translate "<SID>" like "s:".
This commit is contained in:
Bram Moolenaar
2013-06-13 21:24:06 +02:00
parent 5f87b23229
commit 0c6633a7ea
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

@@ -10976,21 +10976,22 @@ f_function(argvars, rettv)
EMSG2(_("E700: Unknown function: %s"), s); EMSG2(_("E700: Unknown function: %s"), s);
else else
{ {
if (STRNCMP(s, "s:", 2) == 0) if (STRNCMP(s, "s:", 2) == 0 || STRNCMP(s, "<SID>", 5) == 0)
{ {
char sid_buf[25]; char sid_buf[25];
int off = *s == 's' ? 2 : 5;
/* Expand s: into <SNR>nr_, so that the function can also be /* Expand s: and <SID> into <SNR>nr_, so that the function can
* called from another script. Using trans_function_name() would * also be called from another script. Using trans_function_name()
* also work, but some plugins depend on the name being printable * would also work, but some plugins depend on the name being
* text. */ * printable text. */
sprintf(sid_buf, "<SNR>%ld_", (long)current_SID); sprintf(sid_buf, "<SNR>%ld_", (long)current_SID);
rettv->vval.v_string = rettv->vval.v_string =
alloc((int)(STRLEN(sid_buf) + STRLEN(s + 2) + 1)); alloc((int)(STRLEN(sid_buf) + STRLEN(s + off) + 1));
if (rettv->vval.v_string != NULL) if (rettv->vval.v_string != NULL)
{ {
STRCPY(rettv->vval.v_string, sid_buf); STRCPY(rettv->vval.v_string, sid_buf);
STRCAT(rettv->vval.v_string, s + 2); STRCAT(rettv->vval.v_string, s + off);
} }
} }
else else

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
1187,
/**/ /**/
1186, 1186,
/**/ /**/