From ddb317ba828f05eb48e98fda530443955485e75d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 7 Oct 2013 22:00:25 +0200 Subject: [PATCH] * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only on >= 10.7. --- src/ChangeLog | 5 +++++ src/nsterm.m | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 909a8a25317..8e22e4f7cf1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-10-07 Jan Djärv + + * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only + on >= 10.7. + 2013-10-07 Dmitry Antipov * insdel.c (insert_from_gap): Prefer ptrdiff_t to int where needed. diff --git a/src/nsterm.m b/src/nsterm.m index 696d379206e..f166aba2e1a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6129,6 +6129,7 @@ if (cols > 0 && rows > 0) { BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (emacsframe) ? YES : NO; #ifdef NS_IMPL_COCOA +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 unsigned val = (unsigned)[NSApp presentationOptions]; // OSX 10.7 bug fix, the menu won't appear without this. @@ -6143,6 +6144,7 @@ if (cols > 0 && rows > 0) [NSApp setPresentationOptions: options]; } +#endif #endif [toolbar setVisible:tbar_visible]; } -- 2.39.2