Mercurial > emacs
changeset 111150:8b6c4202fa46
merge emacs-23
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 20 Oct 2010 09:46:21 +0900 |
| parents | fc09ebad59dd (diff) 497ac3b669cd (current diff) |
| children | cc1681970a9e 913b779aa4ee |
| files | lisp/ChangeLog |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 19 13:52:29 2010 +0200 +++ b/lisp/ChangeLog Wed Oct 20 09:46:21 2010 +0900 @@ -1,3 +1,8 @@ +2010-10-20 Kenichi Handa <handa@m17n.org> + + * face-remap.el (text-scale-adjust): Call read-event with a proper + prompt. + 2010-10-19 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-do-file-attributes-with-stat)
--- a/lisp/face-remap.el Tue Oct 19 13:52:29 2010 +0200 +++ b/lisp/face-remap.el Wed Oct 20 09:46:21 2010 +0900 @@ -312,7 +312,7 @@ (when step (text-scale-increase step) (setq inc 1 first nil) - (setq ev (read-event)))) + (setq ev (read-event "+,-,0 for further adjustment: ")))) (push ev unread-command-events)))