Mercurial > vim
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 13385:6ce6daf93141 | 13386:bf3de2fd98fa |
|---|---|
| 2116 # define mch_msg(str) printf("%s", (str)) | 2116 # define mch_msg(str) printf("%s", (str)) |
| 2117 #else | 2117 #else |
| 2118 # define USE_MCH_ERRMSG | 2118 # define USE_MCH_ERRMSG |
| 2119 #endif | 2119 #endif |
| 2120 | 2120 |
| 2121 # if (defined(FEAT_MBYTE_IME) \ | 2121 # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ |
| 2122 && (!defined(FEAT_GUI_W32) \ | 2122 && ((!defined(FEAT_GUI_W32) \ |
| 2123 || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))) \ | 2123 || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ |
| 2124 || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC)) | 2124 || (defined(MACOS_CONVERT) && !defined(FEAT_GUI_MAC))) |
| 2125 /* Whether IME is supported when XIM is not used, im_get_status() is defined in | 2125 /* Whether IME is supported by im_get_status() defined in mbyte.c. */ |
| 2126 * mbyte.c. */ | |
| 2127 # define IME_WITHOUT_XIM | 2126 # define IME_WITHOUT_XIM |
| 2128 #endif | 2127 #endif |
| 2129 | 2128 |
| 2130 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ | 2129 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ |
| 2131 || defined(IME_WITHOUT_XIM) \ | 2130 || defined(IME_WITHOUT_XIM) \ |
| 2132 || defined(FEAT_GUI_W32) \ | |
| 2133 || defined(FEAT_GUI_MAC)) | 2131 || defined(FEAT_GUI_MAC)) |
| 2134 /* im_set_active() is available */ | 2132 /* im_set_active() is available */ |
| 2135 # define HAVE_INPUT_METHOD | 2133 # define HAVE_INPUT_METHOD |
| 2136 #endif | 2134 #endif |
| 2137 | 2135 |