Mercurial > vim

comparison src/vim.h @ 13414:0e81cd859dec v8.0.1581

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1581: cannot build Win32 GUI without +eval commit https://github.com/vim/vim/commit/3b3a9a5609df2cbaef3512032ac47c1779fbc775 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 6 16:11:47 2018 +0100 patch 8.0.1581: cannot build Win32 GUI without +eval Problem: Cannot build Win32 GUI without +eval. Solution: Define HAVE_INPUT_METHOD without +eval. (Ken Takata)
author Christian Brabandt <cb@256bit.org>
date Tue, 06 Mar 2018 16:15:07 +0100
parents bf3de2fd98fa
children 22b13b27d9fe
comparison
equal deleted inserted replaced
13413:6a7c8fcc30ee 13414:0e81cd859dec
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) && defined(FEAT_EVAL) \ 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(FEAT_GUI_MAC) \
2125 /* Whether IME is supported by im_get_status() defined in mbyte.c. */ 2125 && !defined(MACOS_CONVERT)
2126 /* Whether IME is supported by im_get_status() defined in mbyte.c.
2127 * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
2128 * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
2129 * MACOS_CONVERT is defined. */
2126 # define IME_WITHOUT_XIM 2130 # define IME_WITHOUT_XIM
2127 #endif 2131 #endif
2128 2132
2129 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \ 2133 #if defined(FEAT_MBYTE) && (defined(FEAT_XIM) \
2130 || defined(IME_WITHOUT_XIM) \ 2134 || defined(IME_WITHOUT_XIM) \
2135 || (defined(FEAT_GUI_W32) \
2136 && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
2131 || defined(FEAT_GUI_MAC)) 2137 || defined(FEAT_GUI_MAC))
2132 /* im_set_active() is available */ 2138 /* im_set_active() is available */
2133 # define HAVE_INPUT_METHOD 2139 # define HAVE_INPUT_METHOD
2134 #endif 2140 #endif
2135 2141