diff options
| -rw-r--r-- | src/feature.h | 3 | ||||
| -rw-r--r-- | src/mbyte.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
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 @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1350, +/**/ 1349, /**/ 1348, |