Permalink
Browse files
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.
- Loading branch information...
Showing
with
3 additions
and
2 deletions.
-
+2
−0
src/version.c
-
+1
−2
src/vim.h
|
|
@@ -766,6 +766,8 @@ static char *(features[]) = |
|
|
|
|
|
static int included_patches[] =
|
|
|
{ /* Add new patch number below this line */
|
|
|
/**/
|
|
|
1586,
|
|
|
/**/
|
|
|
1585,
|
|
|
/**/
|
|
|
|
|
|
@@ -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
|
|
|
|
0 comments on commit
201dc67