aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2011-04-02 09:11:00 +0200
committerJan Djärv2011-04-02 09:11:00 +0200
commit8c74fcbddb64afa9ac8a75562634c80379ff24df (patch)
tree94124cad967534929daec22cf7aa6cfc109034b6 /src
parent9952e40bd8d90e89143de066ddd8580925040fbe (diff)
downloademacs-8c74fcbddb64afa9ac8a75562634c80379ff24df.tar.gz
emacs-8c74fcbddb64afa9ac8a75562634c80379ff24df.zip
* nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or later.
Fixes: debbugs:8403
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3b9669b46a9..819ccd60f72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-04-02 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or
4 later (Bug#8403).
5
12011-04-01 Stefan Monnier <monnier@iro.umontreal.ca> 62011-04-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 Add lexical binding. 8 Add lexical binding.
diff --git a/src/nsterm.m b/src/nsterm.m
index 91f0cbba585..f783bbe025f 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -583,6 +583,8 @@ ns_menu_bar_should_be_hidden (void)
583static void 583static void
584ns_update_auto_hide_menu_bar (void) 584ns_update_auto_hide_menu_bar (void)
585{ 585{
586#ifdef NS_IMPL_COCOA
587#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
586 BLOCK_INPUT; 588 BLOCK_INPUT;
587 589
588 NSTRACE (ns_update_auto_hide_menu_bar); 590 NSTRACE (ns_update_auto_hide_menu_bar);
@@ -615,6 +617,8 @@ ns_update_auto_hide_menu_bar (void)
615 } 617 }
616 618
617 UNBLOCK_INPUT; 619 UNBLOCK_INPUT;
620#endif
621#endif
618} 622}
619 623
620 624