From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 27 Nov 2017 21:49:01 +0000 (+0100)
Subject: patch 8.0.1350: cannot build with +eval and -multi_byte
X-Git-Tag: v8.0.1350
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1355aad2b94790217aeef9077d3fb9925461f137;p=vim

patch 8.0.1350: cannot build with +eval and -multi_byte

Problem:    Cannot build with +eval and -multi_byte.
Solution:   Adjust #ifdefs. (John Marriott)  Always include the multi_byte
            feature when an input method feature is enabled.
---

diff --git a/src/feature.h b/src/feature.h
index 6bc56c2cd..a0b0f7e1d 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -635,7 +635,8 @@
 /* #define FEAT_MBYTE_IME */
 # endif
 
-#if defined(FEAT_MBYTE_IME) && !defined(FEAT_MBYTE)
+/* Input methods are only useful with +multi_byte. */
+#if (defined(FEAT_MBYTE_IME) || defined(FEAT_XIM)) && !defined(FEAT_MBYTE)
 # define FEAT_MBYTE
 #endif
 
diff --git a/src/mbyte.c b/src/mbyte.c
index 408c49ad7..742c220df 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4790,7 +4790,7 @@ iconv_end(void)
 # define USE_IMSTATUSFUNC (*p_imsf != NUL)
 #endif
 
-#ifdef FEAT_EVAL
+#if defined(FEAT_EVAL) && defined(FEAT_MBYTE)
     static void
 call_imactivatefunc(int active)
 {
@@ -6486,7 +6486,7 @@ static int im_was_set_active = FALSE;
     int
 im_get_status()
 {
-#  ifdef FEAT_EVAL
+#  if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
     if (USE_IMSTATUSFUNC)
 	return call_imstatusfunc();
 #  endif
diff --git a/src/version.c b/src/version.c
index d44289ace..066294a50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1350,
 /**/
     1349,
 /**/