diff --git a/Filelist b/Filelist index 4dede18a87..202d54bfc6 100644 --- a/Filelist +++ b/Filelist @@ -624,6 +624,7 @@ SRC_DOS_BIN = \ src/xpm/x86/lib-vc14/libXpm.lib \ src/xpm/x86/lib/libXpm.a \ src/xpm/x86/lib/libXpm.lib \ + runtime/bitmaps/vim.ico \ nsis/icons.zip \ # source files for Amiga, DOS, etc. (also in the extra archive) diff --git a/Makefile b/Makefile index 5b5c8bded7..622f93b875 100644 --- a/Makefile +++ b/Makefile @@ -414,6 +414,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \ tar cf - \ $(SRC_ALL) \ $(SRC_DOS) \ + $(SRC_DOS_BIN) \ $(SRC_AMI_DOS) \ $(SRC_DOS_UNIX) \ runtime/doc/uganda.nsis.txt \ @@ -423,9 +424,6 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) \ rmdir dist/vim/$(VIMRTDIR)/runtime # This file needs to be in dos fileformat for NSIS. $(VIM) -e -X -u no_title.vim -c ":set tx|wq" dist/vim/$(VIMRTDIR)/doc/uganda.nsis.txt - tar cf - \ - $(SRC_DOS_BIN) \ - | (cd dist/vim/$(VIMRTDIR); tar xf -) cd dist && zip -9 -rD -z vim$(VERSION)src.zip vim <$(COMMENT_SRC) runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt diff --git a/runtime/bitmaps/vim.ico b/runtime/bitmaps/vim.ico new file mode 100644 index 0000000000..6e998b7e2b Binary files /dev/null and b/runtime/bitmaps/vim.ico differ diff --git a/src/version.c b/src/version.c index 77be61cf89..3c6efdf5d2 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 29, /**/ 28, /**/