aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsmenu.m2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 028c33848a4..6ee3ec6f089 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-08-15 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsmenu.m (menuWillOpen:): Fix preprocessor test (Bug#15001).
4
12013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> 52013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * image.c (imagemagick_compute_animated_image): Respect the GIF 7 * image.c (imagemagick_compute_animated_image): Respect the GIF
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 3266d76450c..5af813ac758 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -575,7 +575,7 @@ extern NSString *NSMenuDidBeginTrackingNotification;
575{ 575{
576 ++trackingMenu; 576 ++trackingMenu;
577 577
578#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6 578#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
579 // On 10.6 we get repeated calls, only the one for NSSystemDefined is "real". 579 // On 10.6 we get repeated calls, only the one for NSSystemDefined is "real".
580 if ([[NSApp currentEvent] type] != NSSystemDefined) return; 580 if ([[NSApp currentEvent] type] != NSSystemDefined) return;
581#endif 581#endif