diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-07-29 21:01:10 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-07-29 21:01:10 +0200 |
commit | 83a2a80d6f699ad9a236431170038698e355c025 (patch) | |
tree | 30b26cbe339f6f112eded09cffd52df2003edfa8 | |
parent | f2c4c391192cab6e923b1a418d4af09106fba25f (diff) |
patch 7.4.2118v7.4.2118
Problem: Mac: can't build with tiny features.
Solution: Don't define FEAT_CLIPBOARD unconditionally. (Kazunobu Kuriyama)
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/version.c b/src/version.c index 962bae7c5e..153b3f5f89 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2118, +/**/ 2117, /**/ 2116, @@ -98,11 +98,11 @@ # ifndef HAVE_CONFIG_H # define UNIX # endif -# ifndef FEAT_CLIPBOARD +# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD) # define FEAT_CLIPBOARD -# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) -# define FEAT_MOUSE -# endif +# endif +# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE) +# define FEAT_MOUSE # endif #endif #if defined(MACOS_X) || defined(MACOS_CLASSIC) |