thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1565: can't build Mac version without GUI

Browse Source 
Problem:    Can't build Mac version without GUI.
Solution:   Adjust when IME_WITHOUT_XIM is defined.
This commit is contained in:
Bram Moolenaar
2018-03-04 18:57:19 +01:00
parent f2bd8ef2b4
commit 107279c17b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -774,6 +774,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1565,
/**/ /**/
1564, 1564,
/**/ /**/

11
src/vim.h
View File

@@ -2118,16 +2118,19 @@ typedef enum {
# define USE_MCH_ERRMSG # define USE_MCH_ERRMSG
#endif #endif
/* Whether IME is supported when XIM is not used. */ # if (defined(FEAT_MBYTE_IME) \
# if defined(FEAT_MBYTE_IME) && \ && (!defined(FEAT_GUI_W32) \
(!defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) || !(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 # define IME_WITHOUT_XIM
#endif #endif
#if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
|| defined(IME_WITHOUT_XIM) \ || defined(IME_WITHOUT_XIM) \
|| defined(FEAT_GUI_W32) \ || defined(FEAT_GUI_W32) \
|| defined(MACOS_CONVERT)) || defined(FEAT_GUI_MAC))
/* im_set_active() is available */ /* im_set_active() is available */
# define HAVE_INPUT_METHOD # define HAVE_INPUT_METHOD
#endif #endif