diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-28 21:11:06 +0200 |
| commit | d057301b1f28736f094affa17b190244ad56e8d9 (patch) | |
| tree | ae20801354321a5ff0d7d23b04d8d6018c57645a /src/globals.h | |
| parent | ef83956e1e67736b4c6b886d897b74f022622a74 (diff) | |
patch 8.0.1236: Mac features are confusingv8.0.1236
Problem: Mac features are confusing.
Solution: Make feature names more consistent, add "osxdarwin". Rename
feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
Diffstat (limited to 'src/globals.h')
| -rw-r--r-- | src/globals.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/globals.h b/src/globals.h index 31bb1bd8bd..318363230b 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1425,7 +1425,7 @@ EXTERN char_u e_failed[] INIT(= N_("E472: Command failed")); #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) EXTERN char_u e_fontset[] INIT(= N_("E234: Unknown fontset: %s")); #endif -#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(MACOS) \ +#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MSWIN) EXTERN char_u e_font[] INIT(= N_("E235: Unknown font: %s")); #endif @@ -1545,7 +1545,7 @@ EXTERN char_u e_readerrf[] INIT(= N_("E47: Error while reading errorfile")); EXTERN char_u e_sandbox[] INIT(= N_("E48: Not allowed in sandbox")); #endif EXTERN char_u e_secure[] INIT(= N_("E523: Not allowed here")); -#if defined(AMIGA) || defined(MACOS) || defined(MSWIN) \ +#if defined(AMIGA) || defined(MACOS_X) || defined(MSWIN) \ || defined(UNIX) || defined(VMS) EXTERN char_u e_screenmode[] INIT(= N_("E359: Screen mode setting not supported")); #endif @@ -1592,7 +1592,7 @@ EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name")); #endif EXTERN char_u e_dirnotf[] INIT(= N_("E919: Directory not found in '%s': \"%s\"")); -#ifdef MACOS_X_UNIX +#ifdef FEAT_GUI_MAC EXTERN short disallow_gui INIT(= FALSE); #endif |