Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
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.
- Loading branch information
Showing
with
9 additions
and
4 deletions.
-
+2
−0
src/version.c
-
+7
−4
src/vim.h
|
@@ -774,6 +774,8 @@ static char *(features[]) = |
|
|
|
|
|
static int included_patches[] = |
|
|
{ /* Add new patch number below this line */ |
|
|
/**/ |
|
|
1565, |
|
|
/**/ |
|
|
1564, |
|
|
/**/ |
|
|
|
@@ -2118,16 +2118,19 @@ typedef enum { |
|
|
# define USE_MCH_ERRMSG |
|
|
#endif |
|
|
|
|
|
/* Whether IME is supported when XIM is not used. */ |
|
|
# if defined(FEAT_MBYTE_IME) && \ |
|
|
(!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) |
|
|
# if (defined(FEAT_MBYTE_IME) \ |
|
|
&& (!defined(FEAT_GUI_W32) \ |
|
|
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \ |
|
|
|| (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)) |
|
|
/* Whether IME is supported when XIM is not used, im_get_status() is defined in |
|
|
* mbyte.c. */ |
|
|
# define IME_WITHOUT_XIM |
|
|
#endif |
|
|
|
|
|
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ |
|
|
|| defined(IME_WITHOUT_XIM) \ |
|
|
|| defined(FEAT_GUI_W32) \ |
|
|
|| defined(MACOS_CONVERT)) |
|
|
|| defined(FEAT_GUI_MAC)) |
|
|
/* im_set_active() is available */ |
|
|
# define HAVE_INPUT_METHOD |
|
|
#endif |
|
|