summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/profiler.c2
-rw-r--r--src/testdir/test_profile.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/profiler.c b/src/profiler.c
index d7d010f79..0bfce8696 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -696,7 +696,7 @@ func_dump_profile(FILE *fd)
get_scriptname(fp->uf_script_ctx.sc_sid));
if (p != NULL)
{
- fprintf(fd, " Defined: %s line %ld\n",
+ fprintf(fd, " Defined: %s:%ld\n",
p, (long)fp->uf_script_ctx.sc_lnum);
vim_free(p);
}
diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim
index d0546df86..a4ce13510 100644
--- a/src/testdir/test_profile.vim
+++ b/src/testdir/test_profile.vim
@@ -55,7 +55,7 @@ func Test_profile_func()
call assert_equal(30, len(lines))
call assert_equal('FUNCTION Foo1()', lines[0])
- call assert_match('Defined:.*Xprofile_func.vim', lines[1])
+ call assert_match('Defined:.*Xprofile_func.vim:3', lines[1])
call assert_equal('Called 2 times', lines[2])
call assert_match('^Total time:\s\+\d\+\.\d\+$', lines[3])
call assert_match('^ Self time:\s\+\d\+\.\d\+$', lines[4])
diff --git a/src/version.c b/src/version.c
index 872088689..1c7ece3c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2055,
+/**/
2054,
/**/
2053,