From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 7 Oct 2013 20:00:25 +0000 (+0200)
Subject: * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1347
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ddb317ba828f05eb48e98fda530443955485e75d;p=emacs.git

* nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
on >= 10.7.
---

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  <jan.h.d@swipnet.se>
+
+	* nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
+	on >= 10.7.
+
 2013-10-07  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* 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];
     }