patch 8.0.1567: cannot build Win32 GUI without IMEv8.0.1567

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.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/vim.h b/src/vim.h
index 21574064f..3cad06297 100644
--- 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