mirror of
https://github.com/vim/vim.git
synced 2025-10-17 07:44:28 -04:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -771,6 +771,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1350,
|
||||
/**/
|
||||
1349,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user