(mouse-set-font): Avoid misleading error message if user makes no selection.

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 01f4479465fb699e24a4d487e710a769cc4c2080..70fee40b53e574a55e7054ee88c268bcaad61265 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2175,11 +2175,12 @@ and selects that window."
 (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 @@ and selects that window."
            (error
             (setq fonts (cdr fonts)))))
        (if (null font)
-           (error "Font not found")))
-    (message "Cannot change fonts on this display")))
+           (error "Font not found")))))
 \f
 ;;; Bindings for mouse commands.