patch 8.2.2883: MS-Windows manifest file name is misleading
Problem: MS-Windows manifest file name is misleading.
Solution: Rename the file. (closes #8241)
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 8895d27..0be3abb 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -820,11 +820,11 @@
$(OUTDIR)/window.o
ifeq ($(VIMDLL),yes)
-OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimrcd.o
-EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimrcc.o
-EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimrcg.o
+OBJ += $(OUTDIR)/os_w32dll.o $(OUTDIR)/vimresd.o
+EXEOBJC = $(OUTDIR)/os_w32exec.o $(OUTDIR)/vimresc.o
+EXEOBJG = $(OUTDIR)/os_w32exeg.o $(OUTDIR)/vimresg.o
else
-OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o
+OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimres.o
endif
ifdef PERL
@@ -1145,21 +1145,21 @@
$(CC) -c $(CFLAGS) $< -o $@
ifeq ($(VIMDLL),yes)
-$(OUTDIR)/vimrcc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico
+$(OUTDIR)/vimresc.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -UFEAT_GUI_MSWIN \
--input-format=rc --output-format=coff -i vim.rc -o $@
-$(OUTDIR)/vimrcg.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h vim.ico
+$(OUTDIR)/vimresg.o: vim.rc vim.manifest version.h gui_w32_rc.h vim.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
--input-format=rc --output-format=coff -i vim.rc -o $@
-$(OUTDIR)/vimrcd.o: vim.rc version.h gui_w32_rc.h \
+$(OUTDIR)/vimresd.o: vim.rc version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) -DRCDLL -DVIMDLLBASE=\\\"$(VIMDLLBASE)\\\" \
--input-format=rc --output-format=coff -i vim.rc -o $@
else
-$(OUTDIR)/vimrc.o: vim.rc gvim.exe.mnf version.h gui_w32_rc.h \
+$(OUTDIR)/vimres.o: vim.rc vim.manifest version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico
$(WINDRES) $(WINDRES_FLAGS) $(DEFINES) \
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 0f5611a..30f8175 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1806,11 +1806,11 @@
$(CC) $(CFLAGS_OUTDIR) $(XPM_INC) xpm_w32.c
!if "$(VIMDLL)" == "yes"
-$(OUTDIR)/vimc.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \
+$(OUTDIR)/vimc.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
vim.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS:-DFEAT_GUI_MSWIN=) vim.rc
-$(OUTDIR)/vimg.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \
+$(OUTDIR)/vimg.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
vim.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc
@@ -1819,7 +1819,7 @@
vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) -DRCDLL -DVIMDLLBASE=\"$(VIMDLLBASE)\" vim.rc
!else
-$(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h gui_w32_rc.h \
+$(OUTDIR)/vim.res: $(OUTDIR) vim.rc vim.manifest version.h gui_w32_rc.h \
tools.bmp tearoff.bmp vim.ico vim_error.ico \
vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /nologo /l 0x409 /Fo$@ $(RCFLAGS) vim.rc
diff --git a/src/version.c b/src/version.c
index 378e846..517e832 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2883,
+/**/
2882,
/**/
2881,
diff --git a/src/gvim.exe.mnf b/src/vim.manifest
similarity index 88%
rename from src/gvim.exe.mnf
rename to src/vim.manifest
index e5c250f..8768b3f 100644
--- a/src/gvim.exe.mnf
+++ b/src/vim.manifest
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ VIM - Vi IMproved by Bram Moolenaar et al.
+ MS-Windows WinSxS (aka Side-by-side assembly) manifest file
+ Do ":help uganda" in Vim to read copying and usage conditions.
+ Do ":help credits" in Vim to see a list of people who contributed.
+-->
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
<assemblyIdentity
processorArchitecture="*"
diff --git a/src/vim.rc b/src/vim.rc
index 35beb97..abb944b 100644
--- a/src/vim.rc
+++ b/src/vim.rc
@@ -46,7 +46,7 @@
# define RT_MANIFEST 24
#endif
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf"
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.manifest"
#endif // RCDLL
//