Sync up with r21-4-12-chise-0_21-gt-j90-r165.

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

diff --git a/lisp/font-menu.el b/lisp/font-menu.el
index 05562c6..80b78dc 100644 (file)
--- a/lisp/font-menu.el
+++ b/lisp/font-menu.el
@@ -160,13 +160,11 @@ the last entry in the menu."
 
 (defvar font-menu-preferred-resolution
   (make-specifier-and-init 'generic '((global ((mswindows) . ":")
-                                             ((gtk) . "*-*")
                                              ((x) . "*-*"))) t)
   "Preferred horizontal and vertical font menu resolution (e.g. \"75:75\").")
 
 (defvar font-menu-size-scaling
   (make-specifier-and-init 'integer '((global ((mswindows) . 1)
-                                             ((gtk) . 10)
                                              ((x) . 10))) t)
   "Scale factor used in defining font sizes.")
 
@@ -379,9 +377,7 @@ or if you change your font path, you can call this to re-initialize the menus."
        (condition-case c
            (font-menu-change-face face
                                   from-family from-weight from-size
-                                  (or family from-family)
-                                  (or weight from-weight)
-                                  (or size from-size))
+                                  family      weight      size)
          (error
           (display-error c nil)
           (sit-for 1)))))
@@ -396,7 +392,7 @@ or if you change your font path, you can call this to re-initialize the menus."
       ;; OK Let Customize do it.
       (custom-set-face-update-spec 'default
                                   (list (list 'type (device-type)))
-                                  (list :family (or family from-family)
+                                  (list :family family
                                         :size (concat
                                                (int-to-string
                                                 (/ (or size from-size)