Mercurial > vim
diff src/syntax.c @ 15868:7fad90423bd2 v8.1.0941
patch 8.1.0941: macros for MS-Windows are inconsistent
commit https://github.com/vim/vim/commit/4f97475d326c2773a78561fb874e4f23c25cbcd9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:44:42 2019 +0100
patch 8.1.0941: macros for MS-Windows are inconsistent
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 17 Feb 2019 17:45:08 +0100 |
| parents | 62b3805506b3 |
| children | 39f0af6c71ed |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -8274,7 +8274,7 @@ free_highlight(void) void restore_cterm_colors(void) { -#if defined(WIN3264) && !defined(FEAT_GUI_W32) +#if defined(MSWIN) && !defined(FEAT_GUI_MSWIN) /* Since t_me has been set, this probably means that the user * wants to use this as default colors. Need to reset default * background/foreground colors. */ @@ -9559,7 +9559,7 @@ set_hl_attr( at_en.ae_u.cterm.fg_color = sgp->sg_cterm_fg; at_en.ae_u.cterm.bg_color = sgp->sg_cterm_bg; # ifdef FEAT_TERMGUICOLORS -# ifdef WIN3264 +# ifdef MSWIN { int id; guicolor_T fg, bg; @@ -9822,8 +9822,8 @@ syn_id2colors(int hl_id, guicolor_T *fgp } #endif -#if (defined(WIN3264) \ - && !defined(FEAT_GUI_W32) \ +#if (defined(MSWIN) \ + && !defined(FEAT_GUI_MSWIN) \ && defined(FEAT_TERMGUICOLORS)) || defined(PROTO) void syn_id2cterm_bg(int hl_id, int *fgp, int *bgp)