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 6bc56c2cd053d9536f0589d4e918c49edf770311..a0b0f7e1d4bdcacee836620f58a942d94a2abfd6 100644 (file)
--- 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 408c49ad7920c8fd03a584de638854a06c569fa2..742c220df9534d2dfcfc7950fcb175009cca1830 100644 (file)
--- 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 d44289ace89587ed76dd13de5761f9a21be3ae7e..066294a50f9c5b31c90fb776ee4e40625a995e8d 100644 (file)
--- 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,
 /**/