From 201dc67db587e77a845fd24681352d61e57156e2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 6 Mar 2018 18:59:57 +0100 Subject: [PATCH] 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. --- src/version.c | 2 ++ src/vim.h | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/version.c b/src/version.c index a4fd2e60a..128be31e9 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1586, /**/ 1585, /**/ diff --git a/src/vim.h b/src/vim.h index a30aa90e2..563d3281f 100644 --- 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 -- 2.50.1