Skip to content

Commit 3b3a9a5

Browse files
committed
patch 8.0.1581: cannot build Win32 GUI without +eval
Problem: Cannot build Win32 GUI without +eval. Solution: Define HAVE_INPUT_METHOD without +eval. (Ken Takata)
1 parent 946acda commit 3b3a9a5

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ static char *(features[]) =
766766

767767
static int included_patches[] =
768768
{ /* Add new patch number below this line */
769+
/**/
770+
1581,
769771
/**/
770772
1580,
771773
/**/

src/vim.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,15 +2119,21 @@ typedef enum {
21192119
#endif
21202120

21212121
# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
2122-
&& ((!defined(FEAT_GUI_W32) \
2122+
&& (!defined(FEAT_GUI_W32) \
21232123
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
2124-
|| (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
2125-
/* Whether IME is supported by im_get_status() defined in mbyte.c. */
2124+
&& !defined(FEAT_GUI_MAC) \
2125+
&& !defined(MACOS_CONVERT)
2126+
/* Whether IME is supported by im_get_status() defined in mbyte.c.
2127+
* For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
2128+
* for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
2129+
* MACOS_CONVERT is defined. */
21262130
# define IME_WITHOUT_XIM
21272131
#endif
21282132

21292133
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
21302134
|| defined(IME_WITHOUT_XIM) \
2135+
|| (defined(FEAT_GUI_W32) \
2136+
&& (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
21312137
|| defined(FEAT_GUI_MAC))
21322138
/* im_set_active() is available */
21332139
# define HAVE_INPUT_METHOD

0 commit comments

Comments
 (0)