Mercurial > vim
changeset 13386:bf3de2fd98fa v8.0.1567
patch 8.0.1567: cannot build Win32 GUI without IME
commit https://github.com/vim/vim/commit/6e35a11490f1f9061677671220ce4cb73176b44a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 4 21:36:05 2018 +0100
patch 8.0.1567: cannot build Win32 GUI without IME
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 04 Mar 2018 21:45:05 +0100 |
| parents | 6ce6daf93141 |
| children | a4ae18a07b3f |
| files | src/gui.c src/version.c src/vim.h |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -1077,7 +1077,7 @@ gui_update_cursor( gui_undraw_cursor(); if (gui.row < 0) return; -#ifdef FEAT_MBYTE +#ifdef HAVE_INPUT_METHOD if (gui.row != gui.cursor_row || gui.col != gui.cursor_col) im_set_position(gui.row, gui.col); #endif @@ -1135,7 +1135,7 @@ gui_update_cursor( if (id > 0) { cattr = syn_id2colors(id, &cfg, &cbg); -#if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN) +#if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN) { static int iid; guicolor_T fg, bg;
--- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1567, +/**/ 1566, /**/ 1565,
--- a/src/vim.h +++ b/src/vim.h @@ -2118,18 +2118,16 @@ typedef enum { # define USE_MCH_ERRMSG #endif -# 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. */ +# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ + && ((!defined(FEAT_GUI_W32) \ + || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ + || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))) +/* Whether IME is supported by im_get_status() 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(FEAT_GUI_MAC)) /* im_set_active() is available */ # define HAVE_INPUT_METHOD