summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-03-12 20:48:13 +0000
committerBram Moolenaar <Bram@vim.org>2008-03-12 20:48:13 +0000
commit39858af5d5b0afc889c5e678a0069213c38e5c13 (patch)
treeeb16ee4ebbd83adec0f31bec419cd3650f2b7d1e
parent57e484671359090d19df3117ffa4d3f4d53f1d74 (diff)
downloadvim-git-39858af5d5b0afc889c5e678a0069213c38e5c13.tar.gz
updated for version 7.1-278v7.1.278
-rw-r--r--src/gui_mac.c8
-rw-r--r--src/version.c2
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
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 278,
+/**/
277,
/**/
276,