X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffaces.el;h=8231011b6c77d7f63abb4a798e2eefbd3f5fafb0;hb=bdcd24d17597d1d8b37fd4fd9423aebe5aae5e44;hp=1870becdb201dc2bfabf37d5410fe179841f13ab;hpb=fc475e6669a613cd6d98eb5511c749a23b63c7ac;p=chise%2Fxemacs-chise.git

diff --git a/lisp/faces.el b/lisp/faces.el
index 1870bec..8231011 100644
--- 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))
@@ -1573,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]))