From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 6 Jul 2010 19:42:46 +0000 (-0400)
Subject: Minor fix to describe-key, and a docstring.
X-Git-Tag: emacs-pretest-23.2.90~139^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8579ebc1540c34d90c238d6e649387c840ceb04;p=emacs.git

Minor fix to describe-key, and a docstring.

* help.el (describe-key): Print up-event using key-description.

* mouse.el (mouse-appearance-menu): Add docstring.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fb6ccc2b65..e4bd2cce4b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-appearance-menu): Add docstring.
+
+	* help.el (describe-key): Print up-event using key-description.
+
 2010-07-03  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/zeroconf.el (zeroconf-resolve-service)
diff --git a/lisp/help.el b/lisp/help.el
index 0c231a78b91..acfd78b301f 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -768,9 +768,10 @@ temporarily enables it to allow getting help on disabled items and buttons."
 
 ----------------- up-event %s----------------
 
-<%S>%s%s runs the command %S, which is "
+%s%s%s runs the command %S, which is "
 			   (if mouse-1-tricky "(short click) " "")
-			   ev-type mouse-msg
+			   (key-description (vector up-event))
+			   mouse-msg
 			   (if mouse-1-remapped
                                " is remapped to <mouse-2>, which" "")
 			   defn-up))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index d1abb7dd4b1..be63f1d73d2 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2483,6 +2483,7 @@ choose a font."
 (declare-function font-face-attributes "font.c" (font &optional frame))
 
 (defun mouse-appearance-menu (event)
+  "Show a menu for changing the default face in the current buffer."
   (interactive "@e")
   (require 'face-remap)
   (when (display-multi-font-p)