diff --git a/src/version.c b/src/version.c
index a4fd2e6..128be31 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1586,
+/**/
     1585,
 /**/
     1584,
diff --git a/src/vim.h b/src/vim.h
index a30aa90..563d328 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2121,8 +2121,7 @@
 # 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