# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 856417662 0
# Node ID 3a99b530ad9a7d2338881a490316503cf51571f1
# Parent  84baf57e05b47a85f1c627e8d48685fa97a84024
(mouse-set-font): Handle fontset.

diff -r 84baf57e05b4 -r 3a99b530ad9a lisp/mouse.el
--- a/lisp/mouse.el	Thu Feb 20 05:47:23 1997 +0000
+++ b/lisp/mouse.el	Thu Feb 20 05:47:42 1997 +0000
@@ -1881,9 +1881,12 @@
   "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