patch 8.0.1567: cannot build Win32 GUI without IME

Problem:    Cannot build Win32 GUI without IME. (John Marriott)
Solution:   Adjust when IME_WITHOUT_XIM and HAVE_INPUT_METHOD are defined and
            use it in a few more places.

diff --git a/src/gui.c b/src/gui.c
index eac4fae6850a60be5e40f1926a11819b054235b1..cc168a8159ca344131c64837a7b84776f25b5eec 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -1077,7 +1077,7 @@ gui_update_cursor(
        gui_undraw_cursor();
        if (gui.row < 0)
            return;
-#ifdef FEAT_MBYTE
+#ifdef HAVE_INPUT_METHOD
        if (gui.row != gui.cursor_row || gui.col != gui.cursor_col)
            im_set_position(gui.row, gui.col);
 #endif
@@ -1135,7 +1135,7 @@ gui_update_cursor(
        if (id > 0)
        {
            cattr = syn_id2colors(id, &cfg, &cbg);
-#if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN)
+#if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN)
            {
                static int iid;
                guicolor_T fg, bg;

diff --git a/src/version.c b/src/version.c
index b00217dcd38038821aeae7b14c3cd870bc6b0368..cbd28eedcdec0675bd49388d351cd245105e3a06 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1567,
 /**/
     1566,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 21574064f944927bb78f455ce4ecf4f8dbd15f09..3cad06297af86e619fe14cdf73c0f4fdbec58862 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -2118,18 +2118,16 @@ typedef enum {
 # define USE_MCH_ERRMSG
 #endif
 
-# if (defined(FEAT_MBYTE_IME) \
-       && (!defined(FEAT_GUI_W32) \
-            || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \
-     || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))
-/* Whether IME is supported when XIM is not used, im_get_status() is defined in
- * mbyte.c. */
+# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
+       && ((!defined(FEAT_GUI_W32) \
+            || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
+            || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
+/* Whether IME is supported by im_get_status() defined in mbyte.c. */
 # define IME_WITHOUT_XIM
 #endif
 
 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
        || defined(IME_WITHOUT_XIM) \
-       || defined(FEAT_GUI_W32) \
        || defined(FEAT_GUI_MAC))
 /* im_set_active() is available */
 # define HAVE_INPUT_METHOD