changeset 9684:441514466726 v7.4.2118

commit https://github.com/vim/vim/commit/83a2a80d6f699ad9a236431170038698e355c025 Author: Bram Moolenaar <Bram@vim.org> 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)
author Christian Brabandt <cb@256bit.org>
date Fri, 29 Jul 2016 21:15:07 +0200
parents 9ea5bca002ef
children fee40b9f4989
files src/version.c src/vim.h
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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)