From 3437b911029ac92ae066fa861d886155a4b97064 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 3 Jul 2013 19:52:53 +0200
Subject: updated for version 7.3.1300 Problem:    Mac: tiny and small build
 fails. Solution:   Don't include os_macosx.m in tiny build. Include mouse
 support in             small build. (Kazunobu Kuriyama)

---
 src/auto/configure | 4 ++++
 src/configure.in   | 7 +++++++
 src/version.c      | 2 ++
 src/vim.h          | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/src/auto/configure b/src/auto/configure
index e93173fe1..4e29d0b53 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12673,6 +12673,10 @@ $as_echo "yes" >&6; }
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+  fi
+        if test "x$features" = "xtiny"; then
+    OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
+    OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
   fi
 fi
 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
diff --git a/src/configure.in b/src/configure.in
index f1720ced5..2fe5a9d8e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -3698,6 +3698,13 @@ if test "x$MACOSX" = "xyes"; then
   else
     AC_MSG_RESULT(no)
   fi
+  dnl As mentioned above, tiny build implies os_macosx.m isn't needed.  
+  dnl Exclude it from OS_EXTRA_SRC so that linker won't complain about
+  dnl missing Objective-C symbols.
+  if test "x$features" = "xtiny"; then
+    OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
+    OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
+  fi
 fi
 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
   LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
diff --git a/src/version.c b/src/version.c
index 5a99da411..10da53dfb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1300,
 /**/
     1299,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 3f01ab737..1555defda 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -101,6 +101,9 @@
 # endif
 # ifndef FEAT_CLIPBOARD
 #  define FEAT_CLIPBOARD
+#  if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
+#   define FEAT_MOUSE
+#  endif
 # endif
 #endif
 #if defined(MACOS_X) || defined(MACOS_CLASSIC)
-- 
cgit v1.2.1