Mercurial > vim
changeset 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 | db1651bfa24d |
| children | bb789ed5113a |
| files | src/version.c src/vim.h |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 */ /**/ + 1586, +/**/ 1585, /**/ 1584,
--- a/src/vim.h +++ b/src/vim.h @@ -2121,8 +2121,7 @@ typedef enum { # if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \ && (!defined(FEAT_GUI_W32) \ || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \ - && !defined(FEAT_GUI_MAC) \ - && !defined(MACOS_CONVERT) + && !(defined(FEAT_GUI_MAC) && defined(MACOS_CONVERT)) /* Whether IME is supported by im_get_status() defined in mbyte.c. * For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined. * for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when