diff --git a/Filelist b/Filelist index 304ddb0a67e34..cbd51b5c32421 100644 --- a/Filelist +++ b/Filelist @@ -631,6 +631,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/nsis/gvim.nsi b/nsis/gvim.nsi index c32a8868f61ef..f9b1790b171a3 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -403,6 +403,9 @@ Section "$(str_section_exe)" id_section_exe SetOutPath $0\autoload\xml File ${VIMRT}\autoload\xml\*.* + SetOutPath $0\bitmaps + File ${VIMSRC}\vim.ico + SetOutPath $0\syntax File ${VIMRT}\syntax\*.* diff --git a/runtime/bitmaps/vim.ico b/runtime/bitmaps/vim.ico new file mode 100644 index 0000000000000..6e998b7e2b3d2 Binary files /dev/null and b/runtime/bitmaps/vim.ico differ diff --git a/src/version.c b/src/version.c index 98ce90cbbf3d3..01c3c32fff4af 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4545, /**/ 4544, /**/ diff --git a/src/vim.ico b/src/vim.ico index 5e94092ac7eb4..6e998b7e2b3d2 100644 Binary files a/src/vim.ico and b/src/vim.ico differ