# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1288152412 25200
# Node ID 1c494f4d6d40604312187dd9e034be8088edd224
# Parent  c430a68b708310c21bcc9ce062a120a474fb0a21
Fix treatment of menu-bar-files-menu.

* lisp/menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
rather than just an unused variable that inherits from the real one.

* doc/lispref/maps.texi (Standard Keymaps): Update File menu description.

diff -r c430a68b7083 -r 1c494f4d6d40 doc/lispref/ChangeLog
--- a/doc/lispref/ChangeLog	Mon Oct 25 12:08:27 2010 -0400
+++ b/doc/lispref/ChangeLog	Tue Oct 26 21:06:52 2010 -0700
@@ -1,3 +1,7 @@
+2010-10-27  Glenn Morris  <rgm@gnu.org>
+
+	* maps.texi (Standard Keymaps): Update File menu description.
+
 2010-10-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* display.texi (Window Systems): Deprecate use of window-system as
diff -r c430a68b7083 -r 1c494f4d6d40 doc/lispref/maps.texi
--- a/doc/lispref/maps.texi	Mon Oct 25 12:08:27 2010 -0400
+++ b/doc/lispref/maps.texi	Tue Oct 26 21:06:52 2010 -0700
@@ -1,7 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+@c   2005, 2006, 2007, 2008, 2009, 2010
+@c   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/maps
 @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
@@ -183,9 +184,9 @@
 @vindex menu-bar-edit-menu
 The keymap which displays the Edit menu in the menu bar.
 
-@item menu-bar-files-menu
-@vindex menu-bar-files-menu
-The keymap which displays the Files menu in the menu bar.
+@item menu-bar-file-menu
+@vindex menu-bar-file-menu
+The keymap which displays the File menu in the menu bar.
 
 @item menu-bar-help-menu
 @vindex menu-bar-help-menu
@@ -239,6 +240,3 @@
 A full keymap used by View mode.
 @end table
 
-@ignore
-   arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
-@end ignore
diff -r c430a68b7083 -r 1c494f4d6d40 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 25 12:08:27 2010 -0400
+++ b/lisp/ChangeLog	Tue Oct 26 21:06:52 2010 -0700
@@ -1,3 +1,8 @@
+2010-10-27  Glenn Morris  <rgm@gnu.org>
+
+	* menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
+	rather than just an unused variable that inherits from the real one.
+
 2010-10-23  Michael McNamara  <mac@mail.brushroad.com>
 
 	* verilog-mode.el (verilog-directive-re): Make this variable
diff -r c430a68b7083 -r 1c494f4d6d40 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Mon Oct 25 12:08:27 2010 -0400
+++ b/lisp/menu-bar.el	Tue Oct 26 21:06:52 2010 -0700
@@ -55,8 +55,8 @@
 (defvar menu-bar-file-menu (make-sparse-keymap "File"))
 (define-key global-map [menu-bar file] (cons (purecopy "File") menu-bar-file-menu))
 
-;; This alias is for compatibility with 19.28 and before.
-(defvar menu-bar-files-menu menu-bar-file-menu)
+;; Only declared obsolete (and only made a proper alias) in 23.3.
+(define-obsolete-variable-alias 'menu-bar-files-menu 'menu-bar-file-menu "22.1")
 
 ;; This is referenced by some code below; it is defined in uniquify.el
 (defvar uniquify-buffer-name-style)
@@ -1997,5 +1997,4 @@
 
 (provide 'menu-bar)
 
-;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
 ;;; menu-bar.el ends here