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

patch 7.4.879

Browse Source 
Problem:    Can't see line numbers in nested function calls.
Solution:   Add line number to the file name. (Alberto Fanjul)
This commit is contained in:
Bram Moolenaar
2015-09-25 17:37:16 +02:00
parent 69b67f7e77
commit 1d6328ca00
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.c
View File

@@ -23817,6 +23817,7 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict)
int ai; int ai;
char_u numbuf[NUMBUFLEN]; char_u numbuf[NUMBUFLEN];
char_u *name; char_u *name;
size_t len;
#ifdef FEAT_PROFILE #ifdef FEAT_PROFILE
proftime_T wait_start; proftime_T wait_start;
proftime_T call_start; proftime_T call_start;
@@ -23948,13 +23949,16 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict)
save_sourcing_name = sourcing_name; save_sourcing_name = sourcing_name;
save_sourcing_lnum = sourcing_lnum; save_sourcing_lnum = sourcing_lnum;
sourcing_lnum = 1; sourcing_lnum = 1;
sourcing_name = alloc((unsigned)((save_sourcing_name == NULL ? 0 /* need space for function name + ("function " + 3) or "[number]" */
: STRLEN(save_sourcing_name)) + STRLEN(fp->uf_name) + 13)); len = (save_sourcing_name == NULL ? 0 : STRLEN(save_sourcing_name))
+ STRLEN(fp->uf_name) + 20;
sourcing_name = alloc((unsigned)len);
if (sourcing_name != NULL) if (sourcing_name != NULL)
{ {
if (save_sourcing_name != NULL if (save_sourcing_name != NULL
&& STRNCMP(save_sourcing_name, "function ", 9) == 0) && STRNCMP(save_sourcing_name, "function ", 9) == 0)
sprintf((char *)sourcing_name, "%s..", save_sourcing_name); sprintf((char *)sourcing_name, "%s[%d]..",
save_sourcing_name, (int)save_sourcing_lnum);
else else
STRCPY(sourcing_name, "function "); STRCPY(sourcing_name, "function ");
cat_func_name(sourcing_name + STRLEN(sourcing_name), fp); cat_func_name(sourcing_name + STRLEN(sourcing_name), fp);

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
879,
/**/ /**/
878, 878,
/**/ /**/