From: Glenn Morris <rgm@gnu.org>
Date: Sat, 23 Oct 2010 21:21:49 +0000 (-0700)
Subject: * src/frame.c (syms_of_frame) <menu-bar-mode>: Sync doc with Lisp.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1fd756baecd8264caf0d68a041c1aa343ea2cb3;p=emacs.git

* src/frame.c (syms_of_frame) <menu-bar-mode>: Sync doc with Lisp.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index eeac05706f5..2e2d771b792 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-23  Glenn Morris  <rgm@gnu.org>
 
 	* buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:
+	* frame.c (syms_of_frame) <menu-bar-mode>:
 	* xdisp.c (syms_of_xdisp) <auto-hscroll-mode, display-hourglass>:
 	<hourglass-delay>: Sync docs with Lisp.
 
diff --git a/src/frame.c b/src/frame.c
index ed54d24197f..2489aa91de0 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,8 @@
 /* Generic frame functions.
-   Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-     2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
+  2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4552,7 +4554,11 @@ recursively).  */);
   staticpro (&Qdelete_frame_functions);
 
   DEFVAR_LISP ("menu-bar-mode", &Vmenu_bar_mode,
-               doc: /* Non-nil if Menu-Bar mode is enabled.  */);
+               doc: /* Non-nil if Menu-Bar mode is enabled.
+See the command `menu-bar-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `menu-bar-mode'.  */);
   Vmenu_bar_mode = Qt;
 
   DEFVAR_LISP ("tool-bar-mode", &Vtool_bar_mode,
@@ -4646,5 +4652,3 @@ automatically.  See also `mouse-autoselect-window'.  */);
 
 }
 
-/* arch-tag: 7dbf2c69-9aad-45f8-8296-db893d6dd039
-   (do not change this comment) */