Mercurial > vim

changeset 12948:851393938fa3 v8.0.1350

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1350: cannot build with +eval and -multi_byte commit https://github.com/vim/vim/commit/1355aad2b94790217aeef9077d3fb9925461f137 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Nov 27 22:49:01 2017 +0100 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.
author Christian Brabandt <cb@256bit.org>
date Mon, 27 Nov 2017 23:00:04 +0100
parents f3384119229e
children bbdb2b017123
files src/feature.h src/mbyte.c src/version.c
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1350,
+/**/
     1349,
 /**/
     1348,