XEmacs 21.2.14.

[chise/xemacs-chise.git.1] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index c847f37..8231011 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1209,6 +1209,8 @@ See `defface' for information about SPEC."
        (init-face-from-resources face frame))
     (let ((frames (relevant-custom-frames)))
       (reset-face face)
+      (if (and (eq 'default face) (featurep 'x))
+         (x-init-global-faces))
       (face-display-set face spec)
       (while frames
        (face-display-set face spec (car frames))
@@ -1249,9 +1251,7 @@ If FRAME is nil, return the default frame properties."
             ;; and cache it...
             (set-frame-property frame 'custom-properties cache))
           cache))
-       ;; We avoid this cache, because various frame and device
-       ;; properties can change.
-       ;;(default-custom-frame-properties)
+       (default-custom-frame-properties)
        (t
         (setq default-custom-frame-properties
               (extract-custom-frame-properties (selected-frame))))))
@@ -1575,7 +1575,7 @@ If the optional FRAME argument is provided, change only
 in that frame; otherwise change each frame."
   (while (not (find-face face))
     (setq face (signal 'wrong-type-argument (list 'facep face))))
-  (locate-file pixmap x-bitmap-file-path ".xbm:" 4)
+  (locate-file pixmap x-bitmap-file-path '(".xbm" ""))
   (while (cond ((stringp pixmap)
                (unless (file-readable-p pixmap)
                  (setq pixmap `[xbm :file ,pixmap]))