# HG changeset patch # User Christian Brabandt # Date 1469819707 -7200 # Node ID 44151446672647d93d3c3773c3642382b1726bdc # Parent 9ea5bca002ef23ae4a33cc39d9350c9ee649b4af commit https://github.com/vim/vim/commit/83a2a80d6f699ad9a236431170038698e355c025 Author: Bram Moolenaar Date: Fri Jul 29 21:01:10 2016 +0200 patch 7.4.2118 Problem: Mac: can't build with tiny features. Solution: Don't define FEAT_CLIPBOARD unconditionally. (Kazunobu Kuriyama) diff --git a/src/version.c b/src/version.c --- 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, diff --git a/src/vim.h b/src/vim.h --- 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)