This commit was generated by cvs2svn to compensate for changes in r1705,

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

diff --git a/lisp/font-menu.el b/lisp/font-menu.el
index 0103764..c406ddc 100644 (file)
--- a/lisp/font-menu.el
+++ b/lisp/font-menu.el
@@ -395,15 +395,14 @@ 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.
-      (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")))            
+      (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)
       (message "Font %s" (face-font-name 'default)))))