From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 29 May 2002 16:36:55 +0000 (+0000)
Subject: (mouse-set-font): Avoid misleading error message if user makes no selection.
X-Git-Tag: ttn-vms-21-2-B4~14828
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8eb1dc02a11982d9d7fdc85fc2cc1f1a30586692;p=emacs.git

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

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 01f4479465f..70fee40b53e 100644
--- 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")))))
 
 ;;; Bindings for mouse commands.