(U+6215): Apply new conventions for glyph granularity.

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

diff --git a/lisp/font-menu.el b/lisp/font-menu.el
index d1cb509..05562c6 100644 (file)
--- a/lisp/font-menu.el
+++ b/lisp/font-menu.el
@@ -160,11 +160,13 @@ 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.")
 
@@ -377,7 +379,9 @@ 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
-                                  family      weight      size)
+                                  (or family from-family)
+                                  (or weight from-weight)
+                                  (or size from-size))
          (error
           (display-error c nil)
           (sit-for 1)))))
@@ -392,7 +396,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 family
+                                  (list :family (or family from-family)
                                         :size (concat
                                                (int-to-string
                                                 (/ (or size from-size)
@@ -405,7 +409,7 @@ or if you change your font path, you can call this to re-initialize the menus."
 (defun font-menu-change-face (face
                              from-family from-weight from-size
                              to-family   to-weight   to-size)
-  (or (symbolp face) (setq face (wrong-type-argument 'symbolp face)))
+  (check-type face symbol)
   (let* ((dcache (device-fonts-cache))
         (font-data (font-menu-font-data face dcache))
         (face-family (aref font-data 1))