(menu-bar-describe-menu): Delete "What's New".

Rename "Describe Key" to "Describe Key or Mouse Operation".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 960d975ec4f9d28ccc3d2c74e06b410b4e741023..ab9bedcbc94723b19fd764837d22e08caca6e60d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2005-08-25  Richard M. Stallman  <rms@gnu.org>
+
+       * menu-bar.el (menu-bar-describe-menu): Delete "What's New".
+       Rename "Describe Key" to "Describe Key or Mouse Operation".
+
+       * mail/mailalias.el (build-mail-aliases): Delete comments
+       from the contents before processing them.
+
+       * isearch.el (isearch-edit-string): Erase the Search prompt
+       if user enters an empty string and there is no default.
+
+       * comint.el (comint-file-name-prefix): Add autoload.
+
+2005-08-25  Joe Corneli  <jcorneli@math.utexas.edu>
+
+       * subr.el (play-sound): Rearrange to avoid warning.
+
 2005-08-25  Carsten Dominik  <dominik@science.uva.nl>
 
        * calendar/diary-lib.el (diary-modify-entry-list-string-function):

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 2b00bfab68f641a573e0ed2e223d9366a104f09a..373d45b4c2beac4d0bd97fb4bf9277d703dadc58 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1255,15 +1255,10 @@ mail status in mode line"))
   '(menu-item "Describe Function..." describe-function
              :help "Display documentation of function/command"))
 (define-key menu-bar-describe-menu [describe-key-1]
-  '(menu-item "Describe Key..." describe-key
+  '(menu-item "Describe Key or Mouse Operation..." describe-key
              ;; Users typically don't identify keys and menu items...
              :help "Display documentation of command bound to a \
-key (or menu-item)"))
-(define-key menu-bar-describe-menu [describe-key]
-  '(menu-item "What's This? " describe-key
-             ;; Users typically don't identify keys and menu items...
-             :help "Display documentation of command bound to a \
-key (or menu-item)"))
+key, a click, or a menu-item"))
 (define-key menu-bar-describe-menu [describe-mode]
   '(menu-item "Describe Buffer Modes" describe-mode
              :help "Describe this buffer's major and minor mode"))