2 files changed, 20 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a5b211ae393..8ca54220521 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-24  Richard M. Stallman  <rms@gnu.org>
+
+        * menu-bar.el (menu-bar-describe-menu): Add "What's This?" item.
+
+        * faces.el (face-set-after-frame-default): Ignore errors
+        in face-spec-face-set.
+
+        * cus-face.el (custom-declare-face): Add face-defface-spec
+        prop after applying the face spec.
+
 2002-11-23  Nick Roberts  <nick@nick.uklinux.net>
 
         * tooltip.el (tooltip-gud-print-command): Add server prefix to the
@@ -11,6 +21,10 @@
         * scroll-all.el (scroll-all-mode): Move arg LIGHTER to the right
         place.  Add groups.
 
+2002-11-22  Simon Marshall  <marshals@perth>
+
+        * font-lock.el (c++-font-lock-extra-types): Add various STL classes.
+
 2002-11-21  Nick Roberts  <nick@nick.uklinux.net>
 
         * gdb-ui.el : General tidying. Patches from Stefan Monnier.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index cc7dd284b1a..ffc25b5da83 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1141,11 +1141,16 @@ paste (in addition to the normal Emacs bindings)."
 (define-key menu-bar-describe-menu [describe-function]
   '(menu-item "Describe Function..." describe-function
               :help "Display documentation of function/command"))
-(define-key menu-bar-describe-menu [describe-key]
+(define-key menu-bar-describe-menu [describe-key-1]
   '(menu-item "Describe Key..." 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)"))
 (define-key menu-bar-describe-menu [describe-mode]
   '(menu-item "Describe Buffer Modes" describe-mode
               :help "Describe this buffer's major and minor mode"))