]> granicus.if.org Git - vim/commitdiff
patch 8.0.1340: MS-Windows: cannot build GUI without IME v8.0.1340
authorBram Moolenaar <Bram@vim.org>
Sat, 25 Nov 2017 16:48:33 +0000 (17:48 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 25 Nov 2017 16:48:33 +0000 (17:48 +0100)
Problem:    MS-Windows: cannot build GUI without IME.
Solution:   Define im_get_status() and im_set_active() when IME is not used.

src/mbyte.c
src/version.c

index b39dddddcd389fb0b6089202b4d20bec3fdb3e50..cf60db07f5a3661bb5d1a2571a7df128f5d51bb0 100644 (file)
@@ -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 */
index 32c83c8e1ddade6f9dcaf0cbd12b0a53e8024bcc..e391e529742422b7b87217b3eb9940718387a406 100644 (file)
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1340,
 /**/
     1339,
 /**/