Mercurial > vim

changeset 13382:7cc66cd50eb3 v8.0.1565

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1565: can't build Mac version without GUI commit https://github.com/vim/vim/commit/107279c17b3a21899e0a9d0293ada040216539ba Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 4 18:57:19 2018 +0100 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.
author Christian Brabandt <cb@256bit.org>
date Sun, 04 Mar 2018 19:00:07 +0100
parents ead6bec510f0
children 22bb9735bd16
files src/version.c src/vim.h
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1565,
+/**/
     1564,
 /**/
     1563,
--- 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