patch 8.1.1556: command for failing screenshot does not include directory

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.

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 50e3384c3c37c146243307e60c9821bcf0ec7cbb..a147b5afc1c001bd127cecc657b14fd7f750a60e 100644 (file)
--- 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 bf1a1f204d75f985945b560b00e32a1d9dd4bbd5..4eb37a7513a52dd7cfa2cbe01a4105768901f779 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1556,
 /**/
     1555,
 /**/