summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-20 22:05:34 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-20 22:05:34 +0100
commitf0764e8bb6511aa3bf1d6f52852b4284676ee661 (patch)
treeebde27a4ebbbdebda03233033109c2776242202c
parent538feb56e87c647d9b1cc8522f7650d263096f63 (diff)
downloadvim-git-f0764e8bb6511aa3bf1d6f52852b4284676ee661.tar.gz
patch 8.2.0139: MS-Windows: default for IME is inconsistentv8.2.0139
Problem: MS-Windows: default for IME is inconsistent. Solution: Also make IME default enabled with MVC. (Ken Takata, closes #5508)
-rw-r--r--src/Make_mvc.mak5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 5704eac0f..87b716952 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 ec77e872e..8e527b8f4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 139,
+/**/
138,
/**/
137,