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.
vim · Mar 4, 2018 · 107279c · 107279c
1 parent f2bd8ef
commit 107279c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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) \
-# if defined(FEAT_MBYTE_IME) && \
+	&& (!defined(FEAT_GUI_W32) \
-    (!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))
+	     || !(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