diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-06 18:59:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-06 18:59:57 +0100 |
| commit | 201dc67db587e77a845fd24681352d61e57156e2 (patch) | |
| tree | f8efed9d22d893cda83f661ed015d3597b604c11 | |
| parent | ebf142a1ed1824ed17a3eb4f64e75616e3b3d0e8 (diff) | |
patch 8.0.1586: imactivatefunc does not work on non-GUI Macv8.0.1586
Problem: Imactivatefunc does not work on non-GUI Mac.
Solution: Fix logic in #ifdef.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index a4fd2e60ab..128be31e93 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1586, +/**/ 1585, /**/ 1584, @@ -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 |