[Emacs-diffs] Changes to emacs/lisp/mouse.el

[Eli Zaretskii]

Index: emacs/lisp/mouse.el
diff -u emacs/lisp/mouse.el:1.231 emacs/lisp/mouse.el:1.232
--- emacs/lisp/mouse.el:1.231   Tue Nov 27 13:00:53 2001
+++ emacs/lisp/mouse.el Wed Nov 28 12:14:07 2001
@@ -2136,10 +2136,11 @@
 (defun mouse-set-font (&rest fonts)
   "Select an emacs font from a list of known good fonts and fontsets."
   (interactive
-   (x-popup-menu
-    last-nonmenu-event
-    ;; Append list of fontsets currently defined.
-    (append x-fixed-font-alist (list (generate-fontset-menu)))))
+   (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))))))
   (if fonts
       (let (font)
        (while fonts
@@ -2151,7 +2152,8 @@
            (error
             (setq fonts (cdr fonts)))))
        (if (null font)
-           (error "Font not found")))))
+           (error "Font not found")))
+    (message "Cannot change fonts on this display")))
 
 ;;; Bindings for mouse commands.