Skip to content

Commit 107279c

Browse files
committed
patch 8.0.1565: can't build Mac version without GUI
Problem: Can't build Mac version without GUI. Solution: Adjust when IME_WITHOUT_XIM is defined.
1 parent f2bd8ef commit 107279c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/version.c

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

775775
static int included_patches[] =
776776
{ /* Add new patch number below this line */
777+
/**/
778+
1565,
777779
/**/
778780
1564,
779781
/**/

src/vim.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,16 +2118,19 @@ typedef enum {
21182118
# define USE_MCH_ERRMSG
21192119
#endif
21202120

2121-
/* Whether IME is supported when XIM is not used. */
2122-
# if defined(FEAT_MBYTE_IME) && \
2123-
(!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))
2121+
# if (defined(FEAT_MBYTE_IME) \
2122+
&& (!defined(FEAT_GUI_W32) \
2123+
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \
2124+
|| (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))
2125+
/* Whether IME is supported when XIM is not used, im_get_status() is defined in
2126+
* mbyte.c. */
21242127
# define IME_WITHOUT_XIM
21252128
#endif
21262129

21272130
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
21282131
|| defined(IME_WITHOUT_XIM) \
21292132
|| defined(FEAT_GUI_W32) \
2130-
|| defined(MACOS_CONVERT))
2133+
|| defined(FEAT_GUI_MAC))
21312134
/* im_set_active() is available */
21322135
# define HAVE_INPUT_METHOD
21332136
#endif

0 commit comments

Comments
 (0)