# HG changeset patch
# User vimboss
# Date 1205354893 0
# Node ID 1dd4e0ccd822156b87516f9cd5a6a004d0d85a11
# Parent  8c9396275bfaf3ba6c759c26fef07c0b687a8abb
updated for version 7.1-278

diff --git a/src/gui_mac.c b/src/gui_mac.c
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -3037,13 +3037,11 @@ receiveHandler(WindowRef theWindow, void
 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
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    278,
+/**/
     277,
 /**/
     276,