Mercurial > vim
diff src/gui.c @ 12716:351cf7c67bbe v8.0.1236
patch 8.0.1236: Mac features are confusing
commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 28 21:11:06 2017 +0200
patch 8.0.1236: Mac features are confusing
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Oct 2017 21:15:35 +0200 |
| parents | 25f7d8ee04c7 |
| children | 29a728529f92 |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -37,7 +37,7 @@ static void gui_set_fg_color(char_u *nam static void gui_set_bg_color(char_u *name); static win_T *xy2win(int x, int y); -#if defined(UNIX) && !defined(MACOS_X) && !defined(__APPLE__) +#if defined(UNIX) && !defined(FEAT_GUI_MAC) # define MAY_FORK static void gui_do_fork(void); @@ -2520,7 +2520,7 @@ gui_outstr_nowrap( /* Draw a composing char on top of the previous char. */ if (comping && sep_comp) { -# if (defined(__APPLE_CC__) || defined(__MRC__)) && TARGET_API_MAC_CARBON +# if defined(__APPLE_CC__) && TARGET_API_MAC_CARBON /* Carbon ATSUI autodraws composing char over previous char */ gui_mch_draw_string(gui.row, scol, s + i, cl, draw_flags | DRAW_TRANSP);