XEmacs 21.2.16 "Sumida".

[chise/xemacs-chise.git.1] / lisp / font-menu.el

diff --git a/lisp/font-menu.el b/lisp/font-menu.el
index c406ddc..0103764 100644 (file)
--- a/lisp/font-menu.el
+++ b/lisp/font-menu.el
@@ -395,14 +395,15 @@ or if you change your font path, you can call this to re-initialize the menus."
        (set-face-font 'default new-default-face-font
                       (and font-menu-this-frame-only-p (selected-frame)))
       ;; OK Let Customize do it.
        (set-face-font 'default new-default-face-font
                       (and font-menu-this-frame-only-p (selected-frame)))
       ;; OK Let Customize do it.

-      (when (and family (not (equal family from-family)))
-       (setq new-props (append (list :family family) new-props)))
-      (when (and size (not (equal size from-size)))
-       (setq new-props (append
-          (list :size (concat (int-to-string (/ size (specifier-instance
-                                                      font-menu-size-scaling
-                                                      (selected-device)))) "pt")) new-props)))
-      (custom-set-face-update-spec 'default '((type x)) new-props)
+      (custom-set-face-update-spec 'default
+               (list (list 'type (device-type)))
+               (list :family family
+                     :size (concat
+                            (int-to-string
+                             (/ size
+                                (specifier-instance font-menu-size-scaling
+                                     (selected-device))))
+                             "pt")))            

       (message "Font %s" (face-font-name 'default)))))
 
 
       (message "Font %s" (face-font-name 'default)))))