summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-16 16:14:20 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-16 16:14:20 +0200
commit8a5c7ef9bbded87abd8c937b16c576ed2ccbb805 (patch)
tree1d1439490d148350a2ef2d948a6b0254ab5e8fdf /src
parent8cdbd5b3c4225b04536dea7523718695306b16b5 (diff)
downloadvim-git-8a5c7ef9bbded87abd8c937b16c576ed2ccbb805.tar.gz
patch 8.1.1556: command for failing screenshot does not include directoryv8.1.1556
Problem: The command displayed to show a failing screenshot does not include the "testdir" directory. Solution: Prefix the directory name so that it can be copy-pasted.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/screendump.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 50e3384c3..a147b5afc 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -144,7 +144,7 @@ func VerifyScreenDump(buf, filename, options, ...)
if i == 100
" Leave the failed dump around for inspection.
if filereadable(reference)
- let msg = 'See dump file difference: call term_dumpdiff("' . testfile . '", "' . reference . '")'
+ let msg = 'See dump file difference: call term_dumpdiff("testdir/' .. testfile .. '", "testdir/' .. reference .. '")'
if a:0 == 1
let msg = a:1 . ': ' . msg
endif
@@ -152,7 +152,7 @@ func VerifyScreenDump(buf, filename, options, ...)
let msg = msg . '; line count is ' . len(testdump) . ' instead of ' . len(refdump)
endif
else
- let msg = 'See new dump file: call term_dumpload("' . testfile . '")'
+ let msg = 'See new dump file: call term_dumpload("testdir/' .. testfile .. '")'
endif
for i in range(len(refdump))
if i >= len(testdump)
diff --git a/src/version.c b/src/version.c
index bf1a1f204..4eb37a751 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1556,
+/**/
1555,
/**/
1554,