aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a4c28b783b5..b11aa27eeaf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-04-03 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsterm.m (ns_update_auto_hide_menu_bar): Define MAC_OS_X_VERSION_10_6
4 if not defined (Bug#8403).
5
12011-04-02 Juanma Barranquero <lekktu@gmail.com> 62011-04-02 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * xdisp.c (display_count_lines): Remove parameter `start', 8 * xdisp.c (display_count_lines): Remove parameter `start',
diff --git a/src/nsterm.m b/src/nsterm.m
index f783bbe025f..c4756dc83cd 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -583,6 +583,9 @@ 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#ifndef MAC_OS_X_VERSION_10_6
587#define MAC_OS_X_VERSION_10_6 1060
588#endif
586#ifdef NS_IMPL_COCOA 589#ifdef NS_IMPL_COCOA
587#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 590#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
588 BLOCK_INPUT; 591 BLOCK_INPUT;