Skip to content

Commit

Permalink
patch 8.0.1581: cannot build Win32 GUI without +eval
Browse files Browse the repository at this point in the history
Problem:    Cannot build Win32 GUI without +eval.
Solution:   Define HAVE_INPUT_METHOD without +eval. (Ken Takata)
  • Loading branch information
brammool committed Mar 6, 2018
1 parent 946acda commit 3b3a9a5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -766,6 +766,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1581,
/**/
1580,
/**/
Expand Down
12 changes: 9 additions & 3 deletions src/vim.h
Expand Up @@ -2119,15 +2119,21 @@ typedef enum {
#endif

# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
&& ((!defined(FEAT_GUI_W32) \
&& (!defined(FEAT_GUI_W32) \
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
|| (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
/* Whether IME is supported by im_get_status() defined in mbyte.c. */
&& !defined(FEAT_GUI_MAC) \
&& !defined(MACOS_CONVERT)
/* Whether IME is supported by im_get_status() defined in mbyte.c.
* For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
* for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
* MACOS_CONVERT is defined. */
# define IME_WITHOUT_XIM
#endif

#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
|| defined(IME_WITHOUT_XIM) \
|| (defined(FEAT_GUI_W32) \
&& (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
|| defined(FEAT_GUI_MAC))
/* im_set_active() is available */
# define HAVE_INPUT_METHOD
Expand Down

0 comments on commit 3b3a9a5

Please sign in to comment.