aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.1581: cannot build Win32 GUI without +eval

Browse Source 
Problem:    Cannot build Win32 GUI without +eval.
Solution:   Define HAVE_INPUT_METHOD without +eval. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2018-03-06 16:11:47 +01:00
parent 946acdac5b
commit 3b3a9a5609
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -766,6 +766,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 */
/**/
1581,
/**/ /**/
1580, 1580,
/**/ /**/

12
src/vim.h
View File

@@ -2119,15 +2119,21 @@ typedef enum {
#endif #endif
# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
&& ((!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))) && !defined(FEAT_GUI_MAC) \
/* Whether IME is supported by im_get_status() defined in mbyte.c. */ && !defined(MACOS_CONVERT)
/* Whether IME is supported by im_get_status() defined in mbyte.c.
* For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
* for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
* MACOS_CONVERT is defined. */
# 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_MBYTE_IME) || defined(GLOBAL_IME))) \
|| defined(FEAT_GUI_MAC)) || defined(FEAT_GUI_MAC))
/* im_set_active() is available */ /* im_set_active() is available */
# define HAVE_INPUT_METHOD # define HAVE_INPUT_METHOD