aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.0.1567: cannot build Win32 GUI without IME

Browse Source 
Problem:    Cannot build Win32 GUI without IME. (John Marriott)
Solution:   Adjust when IME_WITHOUT_XIM and HAVE_INPUT_METHOD are defined and
            use it in a few more places.
This commit is contained in:
Bram Moolenaar
2018-03-04 21:36:05 +01:00
parent 8a3bb56230
commit 6e35a11490
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui.c
View File

@@ -1077,7 +1077,7 @@ gui_update_cursor(
gui_undraw_cursor(); gui_undraw_cursor();
if (gui.row < 0) if (gui.row < 0)
return; return;
#ifdef FEAT_MBYTE #ifdef HAVE_INPUT_METHOD
if (gui.row != gui.cursor_row || gui.col != gui.cursor_col) if (gui.row != gui.cursor_row || gui.col != gui.cursor_col)
im_set_position(gui.row, gui.col); im_set_position(gui.row, gui.col);
#endif #endif
@@ -1135,7 +1135,7 @@ gui_update_cursor(
if (id > 0) if (id > 0)
{ {
cattr = syn_id2colors(id, &cfg, &cbg); cattr = syn_id2colors(id, &cfg, &cbg);
#if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN) #if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN)
{ {
static int iid; static int iid;
guicolor_T fg, bg; guicolor_T fg, bg;

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 */
/**/
1567,
/**/ /**/
1566, 1566,
/**/ /**/

12
src/vim.h
View File

@@ -2118,18 +2118,16 @@ typedef enum {
# define USE_MCH_ERRMSG # define USE_MCH_ERRMSG
#endif #endif
# if (defined(FEAT_MBYTE_IME) \ # 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(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)))
/* Whether IME is supported when XIM is not used, im_get_status() is defined in /* Whether IME is supported by im_get_status() defined in mbyte.c. */
* 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_MAC)) || defined(FEAT_GUI_MAC))
/* im_set_active() is available */ /* im_set_active() is available */
# define HAVE_INPUT_METHOD # define HAVE_INPUT_METHOD