Skip to content

Commit 201dc67

Browse files
committed
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.
1 parent ebf142a commit 201dc67

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,8 @@ static char *(features[]) =
766766

767767
static int included_patches[] =
768768
{ /* Add new patch number below this line */
769+
/**/
770+
1586,
769771
/**/
770772
1585,
771773
/**/

src/vim.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,8 +2121,7 @@ typedef enum {
21212121
# if defined(FEAT_MBYTE) && defined(FEAT_EVAL) \
21222122
&& (!defined(FEAT_GUI_W32) \
21232123
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
2124-
&& !defined(FEAT_GUI_MAC) \
2125-
&& !defined(MACOS_CONVERT)
2124+
&& !(defined(FEAT_GUI_MAC) && defined(MACOS_CONVERT))
21262125
/* Whether IME is supported by im_get_status() defined in mbyte.c.
21272126
* For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
21282127
* for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when

0 commit comments

Comments
 (0)