Mercurial > vim
comparison src/vim.h @ 13424:22b13b27d9fe
patch 8.0.1586: imactivatefunc does not work on non-GUI Mac
commit https://github.com/vim/vim/commit/201dc67db587e77a845fd24681352d61e57156e2
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 6 18:59:57 2018 +0100
patch 8.0.1586: imactivatefunc does not work on non-GUI Mac
Problem: Imactivatefunc does not work on non-GUI Mac.
Solution: Fix logic in #ifdef.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 06 Mar 2018 19:00:07 +0100 |
parents | 0e81cd859dec |
children | 94e638936d3e |
comparison
equal
deleted
inserted
replaced
13423:db1651bfa24d | 13424:22b13b27d9fe |
---|---|
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(FEAT_GUI_MAC) \ | 2124 && !(defined(FEAT_GUI_MAC) && defined(MACOS_CONVERT)) |
2125 && !defined(MACOS_CONVERT) | |
2126 /* Whether IME is supported by im_get_status() defined in mbyte.c. | 2125 /* 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. | 2126 * 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 | 2127 * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when |
2129 * MACOS_CONVERT is defined. */ | 2128 * MACOS_CONVERT is defined. */ |
2130 # define IME_WITHOUT_XIM | 2129 # define IME_WITHOUT_XIM |