patch 7.4.998

Problem:    Running tests in shadow directory fails.  Test 49 fails.
Solution:   Link more files for the shadow directory. Make test 49 end up in
            the right buffer.

diff --git a/src/Makefile b/src/Makefile
index 2cbf6e4e5a11ac0c6dca2e867346f35d27d6e0f1..7cdf813020559e9cbdaf47dec3828416f8ced06c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2461,7 +2461,7 @@ SHADOWDIR = shadow
 
 shadow:        runtime pixmaps
        mkdir $(SHADOWDIR)
-       cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
+       cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../gui_gtk_gresources.xml ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
        mkdir $(SHADOWDIR)/auto
        cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
        mkdir $(SHADOWDIR)/po
@@ -2480,6 +2480,7 @@ shadow:   runtime pixmaps
        fi
        mkdir $(SHADOWDIR)/testdir
        cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \
+                                ../../testdir/Make_all.mak \
                                 ../../testdir/vimrc.unix \
                                 ../../testdir/*.in \
                                 ../../testdir/*.vim \

diff --git a/src/testdir/test49.in b/src/testdir/test49.in
index 5e1d6b461eeb0c39a2871882b33464e6b8b5eb79..79f13f6a56255071805e93325d8f2e09a0499566 100644 (file)
--- a/src/testdir/test49.in
+++ b/src/testdir/test49.in
@@ -8,7 +8,9 @@ STARTTEST
 :se nocp nomore viminfo+=nviminfo
 :lang mess C
 :so test49.vim
-GGGGGGGGGGGGGG"rp:.-,$w! test.out
+:" Go back to this file and append the results from register r.
+:buf test49.in
+G"rp:/^Results/,$w! test.out
 :"
 :" make valgrind happy
 :redir => funclist

diff --git a/src/version.c b/src/version.c
index baab661cbb397600ae286c4c85313f12af292331..670c0af77eff53af7ea3fbd748fab272cbeb3dee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    998,
 /**/
     997,
 /**/