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
index 962bae7c5e08d4f2f9d259d4f081bc5270204769..153b3f5f89ca9cff66fd554402a42e62b9abd61d 100644 (file)
--- 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 498078a4d8636157c9acabcddc4f7b372b6f6c45..b7855270ec3255816d19cf52d0a008183d53f4f2 100644 (file)
--- 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)