From 4368d5ce8a2fa16826d76eeb32347bbbb4fad2bc Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 26 Mar 2018 20:55:10 +0200
Subject: [PATCH] patch 8.0.1646: MS-Windows: executable contains unreferenced
 functions

Problem:    MS-Windows: executable contains unreferenced functions and data.
Solution:   Add /opt:ref to the compiler command. (Ken Takata)
---
 src/Make_mvc.mak | 4 +++-
 src/version.c    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index d5159abd9fa7e..5ca53808771fd 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1158,7 +1158,9 @@ LINK_PDB = /PDB:$(VIM).pdb -debug
 # CFLAGS with /Fo$(OUTDIR)/
 CFLAGS_OUTDIR=$(CFLAGS) /Fo$(OUTDIR)/
 
-conflags = /nologo /subsystem:$(SUBSYSTEM)
+# Add /opt:ref to remove unreferenced functions and data even when /DEBUG is
+# added.
+conflags = /nologo /subsystem:$(SUBSYSTEM) /opt:ref
 
 PATHDEF_SRC = $(OUTDIR)\pathdef.c
 
diff --git a/src/version.c b/src/version.c
index 2cc99778d4def..14bf136adabaf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1646,
 /**/
     1645,
 /**/