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 5704eac0f01461ce64c0b5daa2d6836002a2fa34..87b716952d6d5fd550e8f5607d116a62f93a9256 100644 (file)
--- 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 ec77e872e61154d1940fa0ccfbd7d7ac8168a89a..8e527b8f4a1bda1cadf09bf99add81df84a9bd1f 100644 (file)
--- 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,
 /**/