diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-04 18:57:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-04 18:57:19 +0100 |
| commit | 107279c17b3a21899e0a9d0293ada040216539ba (patch) | |
| tree | cb33f8924c0078826450ccc8ae60d1cf009a743d /src | |
| parent | f2bd8ef2b4507d02c6043affff8f7e85e3414d5f (diff) | |
| download | vim-git-107279c17b3a21899e0a9d0293ada040216539ba.tar.gz | |
patch 8.0.1565: can't build Mac version without GUIv8.0.1565
Problem: Can't build Mac version without GUI.
Solution: Adjust when IME_WITHOUT_XIM is defined.
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c index 18d50af01..01b812c17 100644 --- a/src/version.c +++ b/src/version.c @@ -775,6 +775,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1565, +/**/ 1564, /**/ 1563, @@ -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 |