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.

diff --git a/src/version.c b/src/version.c
index a4fd2e60ab658dcfa42f5a115449772e8538fe5b..128be31e9358040b3dd9eeddd3796a5b68bef235 100644 (file)
--- 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 a30aa90e213eaea64d270bfaa976d0d45e53cafb..563d3281f9a153cae6edd54caf85866eadc10791 100644 (file)
--- 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