From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 25 Nov 2017 16:48:33 +0000 (+0100)
Subject: patch 8.0.1340: MS-Windows: cannot build GUI without IME
X-Git-Tag: v8.0.1340
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=281c93e7140ba87552c4edcbfdaaa5e25dc6a97a;p=vim

patch 8.0.1340: MS-Windows: cannot build GUI without IME

Problem:    MS-Windows: cannot build GUI without IME.
Solution:   Define im_get_status() and im_set_active() when IME is not used.
---

diff --git a/src/mbyte.c b/src/mbyte.c
index b39dddddc..cf60db07f 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -6473,7 +6473,7 @@ xim_get_status_area_height(void)
 
 #else /* !defined(FEAT_XIM) */
 
-# ifndef FEAT_GUI_W32
+# if !defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))
 static int im_was_set_active = FALSE;
 
     int
@@ -6499,6 +6499,13 @@ im_set_active(int active_arg)
     }
 #  endif
 }
+
+#  ifdef FEAT_GUI
+    void
+im_set_position(int row, int col)
+{
+}
+#  endif
 # endif
 
 #endif /* FEAT_XIM */
diff --git a/src/version.c b/src/version.c
index 32c83c8e1..e391e5297 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1340,
 /**/
     1339,
 /**/