5 files changed, 14 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 263ab2eff3b..c48af3a3b40 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -162,6 +162,9 @@ cannot be encoded by the `terminal-coding-system'.
 
 ** On graphical displays, the mode-line no longer ends in dashes.
 
+** On Nextstep/OSX, the menu bar can be hidden by customizing
+   ns-auto-hide-menu-bar.
+
 ** Basic SELinux support has been added.
 This requires Emacs to be linked with libselinux at build time.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6d06821062..a8838161136 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * cus-start.el (all): Add boolean ns-auto-hide-menu-bar.
+
 2011-03-27  Leo Liu  <sdl.web@gmail.com>
 
         * ansi-color.el (ansi-color-names-vector): Allow cons cell value
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 788731e4dbc..1188d37150a 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -356,6 +356,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                       (const alt) (const hyper)
                       (const super)) "23.1")
              (ns-antialias-text ns boolean "23.1")
+             (ns-auto-hide-menu-bar ns boolean "24.0")
              ;; process.c
              (delete-exited-processes processes-basics boolean)
              ;; syntax.c
diff --git a/src/ChangeLog b/src/ChangeLog
index 96f60877fce..0ed011884ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar.
+
 2011-03-27  Anders Lindgren <andlind@gmail.com>
 
         * nsterm.m (ns_menu_bar_is_hidden): New variable.
diff --git a/src/nsterm.m b/src/nsterm.m
index ebfa875ae0e..91f0cbba585 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6486,7 +6486,8 @@ allowing it to be used at a lower level for accented character entry.");
   last_mouse_motion_frame = Qnil;
 
   DEFVAR_LISP ("ns-auto-hide-menu-bar", ns_auto_hide_menu_bar,
-               "Non-nil means that the menu bar is hidden, but appears when the mouse is near.  Only works on OSX 10.6 or later.");
+               doc: /* Non-nil means that the menu bar is hidden, but appears when the mouse is near.
+Only works on OSX 10.6 or later.  */);
   ns_auto_hide_menu_bar = Qnil;
 
   /* TODO: move to common code */