Mercurial > vim
diff src/vim.h @ 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 | 7cc66cd50eb3 |
children | 0e81cd859dec |
line wrap: on
line diff
--- 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