Mercurial > vim

changeset 13414:0e81cd859dec v8.0.1581

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1581: cannot build Win32 GUI without +eval commit https://github.com/vim/vim/commit/3b3a9a5609df2cbaef3512032ac47c1779fbc775 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 6 16:11:47 2018 +0100 patch 8.0.1581: cannot build Win32 GUI without +eval Problem: Cannot build Win32 GUI without +eval. Solution: Define HAVE_INPUT_METHOD without +eval. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Tue, 06 Mar 2018 16:15:07 +0100
parents 6a7c8fcc30ee
children 47c079fc5e6c
files src/version.c src/vim.h
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1581,
+/**/
     1580,
 /**/
     1579,
--- a/src/vim.h
+++ b/src/vim.h
@@ -2119,15 +2119,21 @@ typedef enum {
 #endif
 
 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
-	&& ((!defined(FEAT_GUI_W32) \
+	&& (!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. */
+	&& !defined(FEAT_GUI_MAC) \
+	&& !defined(MACOS_CONVERT)
+/* Whether IME is supported by im_get_status() defined in mbyte.c.
+ * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
+ * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
+ * MACOS_CONVERT is defined. */
 # define IME_WITHOUT_XIM
 #endif
 
 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
 	|| defined(IME_WITHOUT_XIM) \
+	|| (defined(FEAT_GUI_W32) \
+	    && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
 	|| defined(FEAT_GUI_MAC))
 /* im_set_active() is available */
 # define HAVE_INPUT_METHOD