Mercurial > vim
diff src/version.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 | baf88919c791 |
| children | f8f505ffc0a6 |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1236, +/**/ 1235, /**/ 1234, @@ -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