Mercurial > emacs
changeset 109298:c145957f7705
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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 06 Jul 2010 15:42:46 -0400 |
| parents | 2b7e4e256ac1 |
| children | 15fa65282ad3 |
| files | lisp/ChangeLog lisp/help.el lisp/mouse.el |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jul 05 19:16:59 2010 +0200 +++ b/lisp/ChangeLog Tue Jul 06 15:42:46 2010 -0400 @@ -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)
--- a/lisp/help.el Mon Jul 05 19:16:59 2010 +0200 +++ b/lisp/help.el Tue Jul 06 15:42:46 2010 -0400 @@ -768,9 +768,10 @@ ----------------- 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))
--- a/lisp/mouse.el Mon Jul 05 19:16:59 2010 +0200 +++ b/lisp/mouse.el Tue Jul 06 15:42:46 2010 -0400 @@ -2483,6 +2483,7 @@ (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)