diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-27 22:49:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-27 22:49:01 +0100 |
| commit | 1355aad2b94790217aeef9077d3fb9925461f137 (patch) | |
| tree | 605f15ae28451a4e5d5659c62aaef100e28b9e7d | |
| parent | 17471e84a72b5137a6010a98c4adb780237750db (diff) | |
| download | vim-git-1355aad2b94790217aeef9077d3fb9925461f137.tar.gz | |
patch 8.0.1350: cannot build with +eval and -multi_bytev8.0.1350
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.
| -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, |