diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-09-25 17:37:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-09-25 17:37:16 +0200 |
| commit | 1d6328ca00fc6cfe37b1f5e038ec23f443258886 (patch) | |
| tree | 16b7fb18dc0ad25296d1f63d8c66c6ac94d577e5 | |
| parent | 69b67f7e774dc212e8c97495ee81c601b8a89ac2 (diff) | |
patch 7.4.879v7.4.879
Problem: Can't see line numbers in nested function calls.
Solution: Add line number to the file name. (Alberto Fanjul)
| -rw-r--r-- | src/eval.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index 9a590c7491..064e55f6f2 100644 --- a/src/eval.c +++ b/src/eval.c @@ -23817,6 +23817,7 @@ call_user_func(fp, argcount, argvars, rettv, firstline, lastline, selfdict) int ai; char_u numbuf[NUMBUFLEN]; char_u *name; + size_t len; #ifdef FEAT_PROFILE proftime_T wait_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_lnum = sourcing_lnum; sourcing_lnum = 1; - sourcing_name = alloc((unsigned)((save_sourcing_name == NULL ? 0 - : STRLEN(save_sourcing_name)) + STRLEN(fp->uf_name) + 13)); + /* need space for function name + ("function " + 3) or "[number]" */ + 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 (save_sourcing_name != NULL && 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 STRCPY(sourcing_name, "function "); cat_func_name(sourcing_name + STRLEN(sourcing_name), fp); diff --git a/src/version.c b/src/version.c index fadd0d4892..f20dc8992e 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 879, +/**/ 878, /**/ 877, |