From 39858af5d5b0afc889c5e678a0069213c38e5c13 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 12 Mar 2008 20:48:13 +0000
Subject: [PATCH] updated for version 7.1-278

---
 src/gui_mac.c | 8 +++-----
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 901e81f40..77006a73a 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -3037,13 +3037,11 @@ receiveHandler(WindowRef theWindow, void *handlerRefCon, DragRef theDrag)
 gui_mch_init(void)
 {
     /* TODO: Move most of this stuff toward gui_mch_init */
-    Rect	windRect;
-    MenuHandle	pomme;
+    Rect	    windRect;
+    MenuHandle	    pomme;
     EventHandlerRef mouseWheelHandlerRef;
-#ifdef USE_CARBONKEYHANDLER
     EventTypeSpec   eventTypeSpec;
-#endif
-    ControlRef rootControl;
+    ControlRef	    rootControl;
 
     if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
 	gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
diff --git a/src/version.c b/src/version.c
index 78788ec07..a397e8acc 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 */
+/**/
+    278,
 /**/
     277,
 /**/
-- 
2.50.1