XEmacs 21.2-b3

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

diff --git a/lisp/x-font-menu.el b/lisp/x-font-menu.el
index 3e902e1..9a1db5c 100644 (file)
--- a/lisp/x-font-menu.el
+++ b/lisp/x-font-menu.el
@@ -472,12 +472,12 @@ or if you change your font path, you can call this to re-initialize the menus."
       (signal 'error '("couldn't parse font name for default face")))
     (when weight
       (signal 'error '("Setting weight currently not supported")))
       (signal 'error '("couldn't parse font name for default face")))
     (when weight
       (signal 'error '("Setting weight currently not supported")))

-;    (setq new-default-face-font
-;        (font-menu-load-font (or family from-family)
-;                             (or weight from-weight)
-;                             (or size   from-size)
-;                             from-slant
-;                             font-menu-preferred-resolution))
+    (setq new-default-face-font
+         (font-menu-load-font (or family from-family)
+                              (or weight from-weight)
+                              (or size   from-size)
+                              from-slant
+                              font-menu-preferred-resolution))

     (dolist (face (delq 'default (face-list)))
       (when (face-font-instance face)
        (message "Changing font of `%s'..." face)
     (dolist (face (delq 'default (face-list)))
       (when (face-font-instance face)
        (message "Changing font of `%s'..." face)

@@ -490,17 +490,20 @@ or if you change your font path, you can call this to re-initialize the menus."
           (sit-for 1)))))
     ;; Set the default face's font after hacking the other faces, so that
     ;; the frame size doesn't change until we are all done.
           (sit-for 1)))))
     ;; Set the default face's font after hacking the other faces, so that
     ;; the frame size doesn't change until we are all done.

-    
-    (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 10)) "pt")) new-props)))
-    (custom-set-face-update-spec 'default '((type x)) new-props)
-    ;;; WMP - we need to honor font-menu-this-frame-only-p here!      
-;    (set-face-font 'default new-default-face-font
-;                 (and font-menu-this-frame-only-p (selected-frame)))
-    (message "Font %s" (face-font-name 'default))))
+
+    ;; If we need to be frame local we do the changes ourselves.
+    (if font-menu-this-frame-only-p
+    ;;; WMP - we need to honor font-menu-this-frame-only-p here!
+       (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 10)) "pt")) new-props)))
+      (custom-set-face-update-spec 'default '((type x)) new-props)
+      (message "Font %s" (face-font-name 'default)))))

 
 
 (defun font-menu-change-face (face
 
 
 (defun font-menu-change-face (face