adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.1350: cannot build with +eval and -multi_byte

Browse Source 
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.
This commit is contained in:
Bram Moolenaar
2017-11-27 22:49:01 +01:00
parent 17471e84a7
commit 1355aad2b9
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/feature.h
View File

@ -635,7 +635,8 @@
/* #define FEAT_MBYTE_IME */ /* #define FEAT_MBYTE_IME */
# endif # 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 # define FEAT_MBYTE
#endif #endif

4
src/mbyte.c
View File

@ -4790,7 +4790,7 @@ iconv_end(void)
# define USE_IMSTATUSFUNC (*p_imsf != NUL) # define USE_IMSTATUSFUNC (*p_imsf != NUL)
#endif #endif
#ifdef FEAT_EVAL #if defined(FEAT_EVAL) && defined(FEAT_MBYTE)
static void static void
call_imactivatefunc(int active) call_imactivatefunc(int active)
{ {
@ -6486,7 +6486,7 @@ static int im_was_set_active = FALSE;
int int
im_get_status() im_get_status()
{ {
# ifdef FEAT_EVAL # if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
if (USE_IMSTATUSFUNC) if (USE_IMSTATUSFUNC)
return call_imstatusfunc(); return call_imstatusfunc();
# endif # endif

2
src/version.c
View File

@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1350,
/**/ /**/
1349, 1349,
/**/ /**/