diff options
| author | Jan Djärv | 2013-08-15 19:36:45 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-08-15 19:36:45 +0200 |
| commit | 63216c5ee19df8da21574fd5fbafeea8321433a9 (patch) | |
| tree | 329ed4bc2dc4b8d93bec81ce462770c1cc822c13 /src | |
| parent | 6f94cbbcb5cefde19de8fff03834f3c8cb5f6e6d (diff) | |
| download | emacs-63216c5ee19df8da21574fd5fbafeea8321433a9.tar.gz emacs-63216c5ee19df8da21574fd5fbafeea8321433a9.zip | |
* nsmenu.m (menuWillOpen:): Fix preprocessor test.
Fixes: debbugs:15001
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsmenu.m | 2 |
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 @@ | |||
| 1 | 2013-08-15 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsmenu.m (menuWillOpen:): Fix preprocessor test (Bug#15001). | ||
| 4 | |||
| 1 | 2013-08-15 Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 | 2013-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 |