thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1236: Mac features are confusing

Browse Source 
Problem:    Mac features are confusing.
Solution:   Make feature names more consistent, add "osxdarwin". Rename
            feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
This commit is contained in:
Bram Moolenaar
2017-10-28 21:11:06 +02:00
parent ef83956e1e
commit d057301b1f
38 changed files with 268 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1236,
/**/
1235,
/**/
@@ -3389,15 +3391,11 @@ list_version(void)
# endif
# endif
#endif
#ifdef MACOS
# ifdef MACOS_X
# ifdef MACOS_X_UNIX
MSG_PUTS(_("\nMacOS X (unix) version"));
# else
MSG_PUTS(_("\nMacOS X version"));
# endif
#else
MSG_PUTS(_("\nMacOS version"));
#if defined(MACOS_X)
# if defined(MACOS_X_DARWIN)
MSG_PUTS(_("\nmacOS version"));
# else
MSG_PUTS(_("\nmacOS version w/o darwin feat."));
# endif
#endif
@@ -3530,9 +3528,6 @@ list_version(void)
# if defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX
MSG_PUTS(_("with Cocoa GUI."));
# else
# if defined(MACOS)
MSG_PUTS(_("with (classic) GUI."));
# endif
# endif
# endif
# endif