[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100138: Fix treatment of menu-bar-files-menu.

[Glenn Morris]

------------------------------------------------------------
revno: 100138
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-10-26 21:06:52 -0700
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/maps.texi
  lisp/ChangeLog
  lisp/menu-bar.el

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-22 10:35:31 +0000
+++ b/doc/lispref/ChangeLog     2010-10-27 04:06:52 +0000
@@ -1,3 +1,7 @@
+2010-10-27  Glenn Morris  <address@hidden>
+
+       * maps.texi (Standard Keymaps): Update File menu description.
+
 2010-10-22  Eli Zaretskii  <address@hidden>
 
        * display.texi (Window Systems): Deprecate use of window-system as

=== modified file 'doc/lispref/maps.texi'
--- a/doc/lispref/maps.texi     2010-05-03 22:01:23 +0000
+++ b/doc/lispref/maps.texi     2010-10-27 04:06:52 +0000
@@ -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,
address@hidden   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, 
Inc.
address@hidden   2005, 2006, 2007, 2008, 2009, 2010
address@hidden   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.
 
address@hidden menu-bar-files-menu
address@hidden menu-bar-files-menu
-The keymap which displays the Files menu in the menu bar.
address@hidden menu-bar-file-menu
address@hidden 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
 
address@hidden
-   arch-tag: b741253c-7e23-4a02-b3fa-cffd9e4d72b9
address@hidden ignore

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-23 21:12:38 +0000
+++ b/lisp/ChangeLog    2010-10-27 04:06:52 +0000
@@ -1,3 +1,8 @@
+2010-10-27  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * verilog-mode.el (verilog-directive-re): Make this variable

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2010-09-10 03:04:26 +0000
+++ b/lisp/menu-bar.el  2010-10-27 04:06:52 +0000
@@ -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