Mercurial > vim
changeset 9692:02bed64bbd79 v7.4.2122
commit https://github.com/vim/vim/commit/b822cb0f93177bb045b221f607aee735f08ce428
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 30 14:12:23 2016 +0200
patch 7.4.2122
Problem: Mac: don't get +clipboard in huge build.
Solution: Move #define down below including featureh.h
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 30 Jul 2016 14:15:04 +0200 |
| parents | 8b7d22c7a9ab |
| children | 974ebcd5791b |
| files | src/version.c src/vim.h |
| diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2122, +/**/ 2121, /**/ 2120,
--- a/src/vim.h +++ b/src/vim.h @@ -98,12 +98,6 @@ # ifndef HAVE_CONFIG_H # define UNIX # endif -# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) -# define FEAT_CLIPBOARD -# endif -# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) -# define FEAT_MOUSE -# endif #endif #if defined(MACOS_X) || defined(MACOS_CLASSIC) # define MACOS @@ -180,7 +174,20 @@ #endif -#include "feature.h" /* #defines for optionals and features */ +/* + * #defines for optionals and features + * Also defines FEAT_TINY, FEAT_SMALL, etc. when FEAT_HUGE is defined. + */ +#include "feature.h" + +#if defined(MACOS_X_UNIX) +# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) +# define FEAT_CLIPBOARD +# endif +# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) +# define FEAT_MOUSE +# endif +#endif /* +x11 is only enabled when it's both available and wanted. */ #if defined(HAVE_X11) && defined(WANT_X11)