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 --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ccbbe1b9c81dce4677cebe13e177bccf89537c08..5974893288a3fdfcb3ba014f73a389079c58df44 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -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 --git a/doc/lispref/maps.texi b/doc/lispref/maps.texi
index a5b126afcb2682a5161b896476236cdd678dcfe0..4b416a82d642a66bc3080d9a9c88dd9efcd722bf 100644 (file)
--- a/doc/lispref/maps.texi
+++ b/doc/lispref/maps.texi
@@ -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 @@ A sparse keymap used by Lisp mode.
 @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 @@ The keymap defining the contents of the tool bar.
 A full keymap used by View mode.
 @end table
 
-@ignore
-   arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
-@end ignore

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fe7fc852218909847a70d11590bd9f2778eae95a..1522e864a54199d871b065e480c5861805c92a2b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 941ede039967d617f764e9e9af9e0a599b62c664..d25de5b385c6c23769e16fa910aaf4a81b9045f2 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -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 @@ If FRAME is nil or not given, use the selected frame."
 
 (provide 'menu-bar)
 
-;; arch-tag: 6e6a3c22-4ec4-4d3d-8190-583f8ef94ced
 ;;; menu-bar.el ends here