patch 7.4.2122

Problem:    Mac: don't get +clipboard in huge build.
Solution:   Move #define down below including featureh.h

diff --git a/src/version.c b/src/version.c
index 4af1468a7d102eabb2d9b4c1b642faa3233b3907..65ec6b636745aa24957e69e95558668b92d6364e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2122,
 /**/
     2121,
 /**/

diff --git a/src/vim.h b/src/vim.h
index b7855270ec3255816d19cf52d0a008183d53f4f2..756098271191290343e8b59e2453fc4503def58e 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -98,12 +98,6 @@
 # ifndef HAVE_CONFIG_H
 #  define UNIX
 # endif
-# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD)
-#  define FEAT_CLIPBOARD
-# endif
-# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
-#  define FEAT_MOUSE
-# endif
 #endif
 #if defined(MACOS_X) || defined(MACOS_CLASSIC)
 # define MACOS
@@ -180,7 +174,20 @@
 #endif
 
 
-#include "feature.h"   /* #defines for optionals and features */
+/*
+ * #defines for optionals and features
+ * Also defines FEAT_TINY, FEAT_SMALL, etc. when FEAT_HUGE is defined.
+ */
+#include "feature.h"
+
+#if defined(MACOS_X_UNIX)
+# if defined(FEAT_SMALL) && !defined(FEAT_CLIPBOARD)
+#  define FEAT_CLIPBOARD
+# endif
+# if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
+#  define FEAT_MOUSE
+# endif
+#endif
 
 /* +x11 is only enabled when it's both available and wanted. */
 #if defined(HAVE_X11) && defined(WANT_X11)