Skip to content

Commit daaca8a

Browse files
committed
patch 9.0.0029: the bitmaps/vim.ico file is not in the distribution
Problem: The bitmaps/vim.ico file is not in the distribution. Solution: Add it back to the distribution. Adjust the build rules to have it end up in the right place.
1 parent 022f9ef commit daaca8a

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,7 @@ SRC_DOS_BIN = \
624624
src/xpm/x86/lib-vc14/libXpm.lib \
625625
src/xpm/x86/lib/libXpm.a \
626626
src/xpm/x86/lib/libXpm.lib \
627+
runtime/bitmaps/vim.ico \
627628
nsis/icons.zip \
628629

629630
# source files for Amiga, DOS, etc. (also in the extra archive)

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
414414
tar cf - \
415415
$(SRC_ALL) \
416416
$(SRC_DOS) \
417+
$(SRC_DOS_BIN) \
417418
$(SRC_AMI_DOS) \
418419
$(SRC_DOS_UNIX) \
419420
runtime/doc/uganda.nsis.txt \
@@ -423,9 +424,6 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
423424
rmdir dist/vim/$(VIMRTDIR)/runtime
424425
# This file needs to be in dos fileformat for NSIS.
425426
$(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt
426-
tar cf - \
427-
$(SRC_DOS_BIN) \
428-
| (cd dist/vim/$(VIMRTDIR); tar xf -)
429427
cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC)
430428

431429
runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt

runtime/bitmaps/vim.ico

28.1 KB
Binary file not shown.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,8 @@ static char *(features[]) =
735735

736736
static int included_patches[] =
737737
{ /* Add new patch number below this line */
738+
/**/
739+
29,
738740
/**/
739741
28,
740742
/**/

0 commit comments

Comments
 (0)