summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/gvim.exe.mnf8
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 63552b4e1..72e722b42 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1040,7 +1040,7 @@ $(OUTDIR)/window.obj: $(OUTDIR) window.c $(INCL)
$(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
-$(OUTDIR)/vim.res: $(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
+$(OUTDIR)/vim.res: $(OUTDIR) vim.rc gvim.exe.mnf version.h tools.bmp tearoff.bmp \
vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
diff --git a/src/gvim.exe.mnf b/src/gvim.exe.mnf
index 21f1c2e90..003397992 100644
--- a/src/gvim.exe.mnf
+++ b/src/gvim.exe.mnf
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
<assemblyIdentity
processorArchitecture="*"
version="7.2.0.0"
@@ -29,4 +29,10 @@
</requestedPrivileges>
</security>
</trustInfo>
+ <!-- Vista High DPI aware -->
+ <asmv3:application>
+ <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+ <dpiAware>true</dpiAware>
+ </asmv3:windowsSettings>
+ </asmv3:application>
</assembly>
diff --git a/src/version.c b/src/version.c
index 329191f8f..01957033b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 205,
+/**/
204,
/**/
203,