File tree Expand file tree Collapse file tree 3 files changed +20
-1
lines changed
Expand file tree Collapse file tree 3 files changed +20
-1
lines changed Original file line number Diff line number Diff line change @@ -85,6 +85,7 @@ SRC_ALL = \
8585 src/main.aap \
8686 src/testdir/main.aap \
8787 src/testdir/README.txt \
88+ src/testdir/Make_all.mak \
8889 src/testdir/*.in \
8990 src/testdir/sautest/autoload/*.vim \
9091 src/testdir/runtest.vim \
@@ -169,6 +170,7 @@ SRC_UNIX = \
169170 README_src.txt \
170171 configure \
171172 pixmaps/*.xpm \
173+ pixmaps/*.png \
172174 pixmaps/gen-inline-pixbufs.sh \
173175 pixmaps/stock_icons.h \
174176 src/INSTALL \
@@ -189,6 +191,7 @@ SRC_UNIX = \
189191 src/gui_gtk_f.c \
190192 src/gui_gtk_f.h \
191193 src/gui_gtk_x11.c \
194+ src/gui_gtk_gresources.xml \
192195 src/gui_motif.c \
193196 src/gui_xmdlg.c \
194197 src/gui_xmebw.c \
@@ -214,6 +217,7 @@ SRC_UNIX = \
214217 src/proto/gui_athena.pro \
215218 src/proto/gui_gtk.pro \
216219 src/proto/gui_gtk_x11.pro \
220+ src/proto/gui_gtk_gresources.pro \
217221 src/proto/gui_motif.pro \
218222 src/proto/gui_xmdlg.pro \
219223 src/proto/gui_x11.pro \
Original file line number Diff line number Diff line change @@ -143,18 +143,31 @@ MINOR = 4
143143# For Windows 98/ME the 2003 version is required, but then the executable
144144# won't work on Windows 7 and 64 bit systems.
145145# - "nmake -f Make_mvc.mak" (use the same path as for vcvars32.bat)
146- # - "rm testdir/*.out", "nmake -f Make_mvc.mak test" and check the output.
146+ # - Run the tests:
147+ # > rm testdir/*.out
148+ # > nmake -f Make_mvc.mak test
149+ # - check the output.
147150# - Rename vim.exe to vimw32.exe, xxd/xxd.exe to xxdw32.exe.
148151# - Rename vim.pdb to vimw32.pdb.
149152# - Rename install.exe to installw32.exe and uninstal.exe to uninstalw32.exe.
150153# Win32 GUI version:
151154# - "nmake -f Make_mvc.mak GUI=yes"
155+ # - Run the tests:
156+ # > cd testdir
157+ # > rm *.out
158+ # > nmake -f Make_dos.mak VIMPROG=..\gvim
159+ # - check the output.
152160# - move "gvim.exe" to here (otherwise the OLE version will overwrite it).
153161# - Move gvim.pdb to here.
154162# - Delete vimrun.exe, install.exe and uninstal.exe.
155163# - Copy "GvimExt/gvimext.dll" to here.
156164# Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME:
157165# - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...)
166+ # - Run the tests:
167+ # > cd testdir
168+ # > rm *.out
169+ # > nmake -f Make_dos.mak VIMPROG=..\gvim
170+ # - check the output.
158171# - Rename "gvim.exe" to "gvim_ole.exe".
159172# - Rename gvim.pdb to "gvim_ole.pdb".
160173# - Delete install.exe and uninstal.exe.
Original file line number Diff line number Diff line change @@ -741,6 +741,8 @@ static char *(features[]) =
741741
742742static int included_patches [] =
743743{ /* Add new patch number below this line */
744+ /**/
745+ 996 ,
744746/**/
745747 995 ,
746748/**/
You can’t perform that action at this time.
0 commit comments