Mercurial > emacs
changeset 45570:1739a350f81c
(mouse-set-font): Avoid misleading error message if user makes no selection.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 29 May 2002 16:36:55 +0000 |
| parents | 5a8e504582e3 |
| children | 04484b8dacdc |
| files | lisp/mouse.el |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mouse.el Wed May 29 16:35:56 2002 +0000 +++ b/lisp/mouse.el Wed May 29 16:36:55 2002 +0000 @@ -2175,11 +2175,12 @@ (defun mouse-set-font (&rest fonts) "Select an emacs font from a list of known good fonts and fontsets." (interactive - (and (display-multi-font-p) - (x-popup-menu - last-nonmenu-event - ;; Append list of fontsets currently defined. - (append x-fixed-font-alist (list (generate-fontset-menu)))))) + (progn (unless (display-multi-font-p) + (error "Cannot change fonts on this display")) + (x-popup-menu + last-nonmenu-event + ;; Append list of fontsets currently defined. + (append x-fixed-font-alist (list (generate-fontset-menu)))))) (if fonts (let (font) (while fonts @@ -2191,8 +2192,7 @@ (error (setq fonts (cdr fonts))))) (if (null font) - (error "Font not found"))) - (message "Cannot change fonts on this display"))) + (error "Font not found"))))) ;;; Bindings for mouse commands.