[Emacs-diffs] trunk r114563: * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only

[Jan D.]

------------------------------------------------------------
revno: 114563
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-07 22:00:25 +0200
message:
  * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
  on >= 10.7.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-07 15:11:17 +0000
+++ b/src/ChangeLog     2013-10-07 20:00:25 +0000
@@ -1,3 +1,8 @@
+2013-10-07  Jan Djärv  <address@hidden>
+
+       * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
+       on >= 10.7.
+
 2013-10-07  Dmitry Antipov  <address@hidden>
 
        * insdel.c (insert_from_gap): Prefer ptrdiff_t to int where needed.

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-10-06 15:59:11 +0000
+++ b/src/nsterm.m      2013-10-07 20:00:25 +0000
@@ -6129,6 +6129,7 @@
     {
       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.
@@ -6144,6 +6145,7 @@
           [NSApp setPresentationOptions: options];
         }
 #endif
+#endif
       [toolbar setVisible:tbar_visible];
     }
 }