Permalink
Browse files

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.
  • Loading branch information...
brammool committed Nov 27, 2017
1 parent 17471e8 commit 1355aad2b94790217aeef9077d3fb9925461f137
Showing with 6 additions and 3 deletions.
  1. +2 −1 src/feature.h
  2. +2 −2 src/mbyte.c
  3. +2 −0 src/version.c
View
@@ -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
View
@@ -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
View
@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1350,
/**/
1349,
/**/

0 comments on commit 1355aad

Please sign in to comment.