summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2005-08-25 11:03:32 +0000
committerRichard M. Stallman <rms@gnu.org>2005-08-25 11:03:32 +0000
commitc6a816dfe1387deccbb9d293e054f2a6d09b8b34 (patch)
tree35a2e3653c05a35a9029b0a7cd71fb2340aaa6ff /lisp
parentcc1f74de8c34e63a2af373481a40496b88d8da66 (diff)
downloademacs-c6a816dfe1387deccbb9d293e054f2a6d09b8b34.tar.gz
emacs-c6a816dfe1387deccbb9d293e054f2a6d09b8b34.tar.bz2
emacs-c6a816dfe1387deccbb9d293e054f2a6d09b8b34.zip
(menu-bar-describe-menu): Delete "What's New".
Rename "Describe Key" to "Describe Key or Mouse Operation".
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/menu-bar.el9
2 files changed, 19 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 960d975ec4f..ab9bedcbc94 100644
--- 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 2b00bfab68f..373d45b4c2b 100644
--- 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"))