From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 20 Feb 1997 05:47:42 +0000 (+0000)
Subject: (mouse-set-font): Handle fontset.
X-Git-Tag: emacs-20.1~2937
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51a02226c265cacf79c59ae6d653b93f1c7d6d22;p=emacs.git

(mouse-set-font): Handle fontset.
---

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 2bc8b191fa2..48623cebad8 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1881,9 +1881,12 @@ and selects that window."
   "X fonts suitable for use in Emacs.")
 
 (defun mouse-set-font (&rest fonts)
-  "Select an emacs font from a list of known good fonts"
+  "Select an emacs font from a list of known good fonts and fontsets."
   (interactive
-   (x-popup-menu last-nonmenu-event x-fixed-font-alist))
+   (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