aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-10-07 22:00:25 +0200
committerJan Djärv2013-10-07 22:00:25 +0200
commitddb317ba828f05eb48e98fda530443955485e75d (patch)
treeebefcdd58576dac0b41944f43735ce5d1e385796 /src
parent2abb4e656039e19e36bcee12ced22a45383ea156 (diff)
downloademacs-ddb317ba828f05eb48e98fda530443955485e75d.tar.gz
emacs-ddb317ba828f05eb48e98fda530443955485e75d.zip
* nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
on >= 10.7.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 909a8a25317..8e22e4f7cf1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-10-07 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (windowDidEnterFullScreen:): setPresentationOptions only
4 on >= 10.7.
5
12013-10-07 Dmitry Antipov <dmantipov@yandex.ru> 62013-10-07 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 * insdel.c (insert_from_gap): Prefer ptrdiff_t to int where needed. 8 * 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)
6129 { 6129 {
6130 BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (emacsframe) ? YES : NO; 6130 BOOL tbar_visible = FRAME_EXTERNAL_TOOL_BAR (emacsframe) ? YES : NO;
6131#ifdef NS_IMPL_COCOA 6131#ifdef NS_IMPL_COCOA
6132#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
6132 unsigned val = (unsigned)[NSApp presentationOptions]; 6133 unsigned val = (unsigned)[NSApp presentationOptions];
6133 6134
6134 // OSX 10.7 bug fix, the menu won't appear without this. 6135 // OSX 10.7 bug fix, the menu won't appear without this.
@@ -6144,6 +6145,7 @@ if (cols > 0 && rows > 0)
6144 [NSApp setPresentationOptions: options]; 6145 [NSApp setPresentationOptions: options];
6145 } 6146 }
6146#endif 6147#endif
6148#endif
6147 [toolbar setVisible:tbar_visible]; 6149 [toolbar setVisible:tbar_visible];
6148 } 6150 }
6149} 6151}