From 83a2a80d6f699ad9a236431170038698e355c025 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 29 Jul 2016 21:01:10 +0200 Subject: [PATCH] patch 7.4.2118 Problem: Mac: can't build with tiny features. Solution: Don't define FEAT_CLIPBOARD unconditionally. (Kazunobu Kuriyama) --- src/version.c | 2 ++ 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 @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2118, /**/ 2117, /**/ diff --git a/src/vim.h b/src/vim.h index 498078a4d8..b7855270ec 100644 --- a/src/vim.h +++ b/src/vim.h @@ -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)