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 2cbf6e4..7cdf813 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2461,7 +2461,7 @@
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 @@
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 5e1d6b4..79f13f6 100644
--- a/src/testdir/test49.in
+++ b/src/testdir/test49.in
@@ -8,7 +8,9 @@
: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 baab661..670c0af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 998,
+/**/
997,
/**/
996,