projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9952e40
)
* nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or later.
author
Jan Djärv
<jan.h.d@swipnet.se>
Sat, 2 Apr 2011 07:11:00 +0000
(09:11 +0200)
committer
Jan Djärv
<jan.h.d@swipnet.se>
Sat, 2 Apr 2011 07:11:00 +0000
(09:11 +0200)
Fixes: debbugs:8403
src/ChangeLog
patch
|
blob
|
history
src/nsterm.m
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 3b9669b46a937b9838a80f325d261fa261a0e6b1..819ccd60f726dda7508aace9f007e5309e66e7e0 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,8
@@
+2011-04-02 Jan Djärv <jan.h.d@swipnet.se>
+
+ * nsterm.m (ns_update_auto_hide_menu_bar): Only for OSX 10.6 or
+ later (Bug#8403).
+
2011-04-01 Stefan Monnier <monnier@iro.umontreal.ca>
Add lexical binding.
diff --git
a/src/nsterm.m
b/src/nsterm.m
index 91f0cbba5859531503f9ff850a100198f346eea6..f783bbe025fa366050b4d97511c314d4c69fd673 100644
(file)
--- a/
src/nsterm.m
+++ b/
src/nsterm.m
@@
-583,6
+583,8
@@
ns_menu_bar_should_be_hidden (void)
static void
ns_update_auto_hide_menu_bar (void)
{
+#ifdef NS_IMPL_COCOA
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
BLOCK_INPUT;
NSTRACE (ns_update_auto_hide_menu_bar);
@@
-615,6
+617,8
@@
ns_update_auto_hide_menu_bar (void)
}
UNBLOCK_INPUT;
+#endif
+#endif
}