patch 7.4.996
Problem: New GDK files and testdir/Make_all.mak missing from distribution.
PC build instructions are outdated.
Solution: Add the file to the list. Update PC build instructions.
diff --git a/Filelist b/Filelist
index 6ad49e2..e653fa1 100644
--- a/Filelist
+++ b/Filelist
@@ -85,6 +85,7 @@
src/main.aap \
src/testdir/main.aap \
src/testdir/README.txt \
+ src/testdir/Make_all.mak \
src/testdir/*.in \
src/testdir/sautest/autoload/*.vim \
src/testdir/runtest.vim \
@@ -169,6 +170,7 @@
README_src.txt \
configure \
pixmaps/*.xpm \
+ pixmaps/*.png \
pixmaps/gen-inline-pixbufs.sh \
pixmaps/stock_icons.h \
src/INSTALL \
@@ -189,6 +191,7 @@
src/gui_gtk_f.c \
src/gui_gtk_f.h \
src/gui_gtk_x11.c \
+ src/gui_gtk_gresources.xml \
src/gui_motif.c \
src/gui_xmdlg.c \
src/gui_xmebw.c \
@@ -214,6 +217,7 @@
src/proto/gui_athena.pro \
src/proto/gui_gtk.pro \
src/proto/gui_gtk_x11.pro \
+ src/proto/gui_gtk_gresources.pro \
src/proto/gui_motif.pro \
src/proto/gui_xmdlg.pro \
src/proto/gui_x11.pro \
diff --git a/Makefile b/Makefile
index 3565357..d924128 100644
--- a/Makefile
+++ b/Makefile
@@ -143,18 +143,31 @@
# For Windows 98/ME the 2003 version is required, but then the executable
# won't work on Windows 7 and 64 bit systems.
# - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
-# - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
+# - Run the tests:
+# > rm testdir/*.out
+# > nmake -f Make_mvc.mak test
+# - check the output.
# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
# - Rename vim.pdb to vimw32.pdb.
# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
# Win32 GUI version:
# - "nmake -f Make_mvc.mak GUI=yes"
+# - Run the tests:
+# > cd testdir
+# > rm *.out
+# > nmake -f Make_dos.mak VIMPROG=..\gvim
+# - check the output.
# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
# - Move gvim.pdb to here.
# - Delete vimrun.exe, install.exe and uninstal.exe.
# - Copy "GvimExt/gvimext.dll" to here.
# Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME:
# - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...)
+# - Run the tests:
+# > cd testdir
+# > rm *.out
+# > nmake -f Make_dos.mak VIMPROG=..\gvim
+# - check the output.
# - Rename "gvim.exe" to "gvim_ole.exe".
# - Rename gvim.pdb to "gvim_ole.pdb".
# - Delete install.exe and uninstal.exe.
diff --git a/src/version.c b/src/version.c
index b438afa..1df2b6aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 996,
+/**/
995,
/**/
994,