From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 4 Mar 2018 17:57:19 +0000 (+0100)
Subject: patch 8.0.1565: can't build Mac version without GUI
X-Git-Tag: v8.0.1565
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=107279c17b3a21899e0a9d0293ada040216539ba;p=vim

patch 8.0.1565: can't build Mac version without GUI

Problem:    Can't build Mac version without GUI.
Solution:   Adjust when IME_WITHOUT_XIM is defined.
---

diff --git a/src/version.c b/src/version.c
index 18d50af01..01b812c17 100644
--- a/src/version.c
+++ b/src/version.c
@@ -774,6 +774,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1565,
 /**/
     1564,
 /**/
diff --git a/src/vim.h b/src/vim.h
index f0d29afd0..21574064f 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2118,16 +2118,19 @@ typedef enum {
 # define USE_MCH_ERRMSG
 #endif
 
-/* Whether IME is supported when XIM is not used. */
-# if defined(FEAT_MBYTE_IME) && \
-    (!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))
+# 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. */
 # define IME_WITHOUT_XIM
 #endif
 
 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
 	|| defined(IME_WITHOUT_XIM) \
 	|| defined(FEAT_GUI_W32) \
-	|| defined(MACOS_CONVERT))
+	|| defined(FEAT_GUI_MAC))
 /* im_set_active() is available */
 # define HAVE_INPUT_METHOD
 #endif