From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 8 Mar 2007 19:34:12 +0000 (+0000)
Subject: updated for version 7.0-215
X-Git-Tag: v7.0.215
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48c2c9a19a1f2703c500c6dc8c8250dbf6c0acc9;p=vim

updated for version 7.0-215
---

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 33b985053..6114d7900 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2800,9 +2800,6 @@ gui_mch_prepare(int *argc, char **argv)
 # endif
 #endif
 
-    /* Why did I put that in? (Dany) */
-    MoreMasterPointers (0x40 * 3); /* we love handles */
-
 #if 0
     InitCursor();
 
@@ -4966,6 +4963,7 @@ gui_mch_set_scrollbar_thumb(
     SetControl32BitMaximum (sb->id, max);
     SetControl32BitMinimum (sb->id, 0);
     SetControl32BitValue   (sb->id, val);
+    SetControlViewSize     (sb->id, size);    
 #ifdef DEBUG_MAC_SB
     printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
 #endif
@@ -5727,7 +5725,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
     /* TODO: Get the text selection from Vim */
 
     /* Call to Handle Popup */
-    status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemNoHelp,
+    status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemRemoveHelp,
 		       HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem);
 
     if (status == noErr)
diff --git a/src/version.c b/src/version.c
index 6c4c641f1..d577c50b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    215,
 /**/
     214,
 /**/