From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 20 Jan 2020 21:05:34 +0000 (+0100)
Subject: patch 8.2.0139: MS-Windows: default for IME is inconsistent
X-Git-Tag: v8.2.0139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0764e8bb6511aa3bf1d6f52852b4284676ee661;p=thirdparty%2Fvim.git

patch 8.2.0139: MS-Windows: default for IME is inconsistent

Problem:    MS-Windows: default for IME is inconsistent.
Solution:   Also make IME default enabled with MVC. (Ken Takata, closes #5508)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5704eac0f0..87b716952d 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -33,7 +33,7 @@
 #
 #	OLE interface: OLE=yes (usually with GUI=yes)
 #
-#	IME support: IME=yes	(requires GUI=yes)
+#	IME support: IME=yes	(default is yes)
 #	  DYNAMIC_IME=[yes or no]  (to load the imm32.dll dynamically, default
 #	  is yes)
 #	Global IME support: GIME=yes (requires GUI=yes)
@@ -812,6 +812,9 @@ OLE_IDL = if_ole.idl
 OLE_LIB = oleaut32.lib
 !endif
 
+!ifndef IME
+IME = yes
+!endif
 !if "$(IME)" == "yes"
 CFLAGS = $(CFLAGS) -DFEAT_MBYTE_IME
 ! ifndef DYNAMIC_IME
diff --git a/src/version.c b/src/version.c
index ec77e872e6..8e527b8f4a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    139,
 /**/
     138,
 /**/