(custom-theme-set-faces): Undo previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d6075ce27f43407076cadef33d9a44af38aea67..340c8c796b1ddbd96299066dd6681617fa610b9d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-17  Richard Stallman  <rms@gnu.org>
+
+       * cus-face.el (custom-theme-set-faces): Undo previous change.
+
+       * faces.el (face-spec-set): When FRAME nil, look up each frame in SPEC.
+
 2007-09-17  Glenn Morris  <rgm@gnu.org>
 
        * textmodes/tex-mode.el (tex-region): Simplify previous change,

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 09cf058dc64ef19075077fc47854935cfad1c9bd..92274dcbe2128b25acd1d78bf7a2e5b417fda894 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -342,17 +342,16 @@ FACE's list property `theme-face' \(using `custom-push-theme')."
                (unless (facep face)
                  (make-empty-face face))
                (put face 'face-comment comment)
-               (dolist (frame (frame-list))
-                 (face-spec-set face spec frame)))
-           (setq args (cdr args)))
-       ;; Old format, a plist of FACE SPEC pairs.
-       (let ((face (nth 0 args))
-             (spec (nth 1 args)))
-         (if (get face 'face-alias)
-                 (setq face (get face 'face-alias)))
-         (put face 'saved-face spec)
-         (custom-push-theme 'theme-face face theme 'set spec))
-       (setq args (cdr (cdr args))))))))
+               (face-spec-set face spec nil))
+             (setq args (cdr args)))
+         ;; Old format, a plist of FACE SPEC pairs.
+         (let ((face (nth 0 args))
+               (spec (nth 1 args)))
+           (if (get face 'face-alias)
+               (setq face (get face 'face-alias)))
+           (put face 'saved-face spec)
+           (custom-push-theme 'theme-face face theme 'set spec))
+         (setq args (cdr (cdr args))))))))
 
 ;; XEmacs compability function.  In XEmacs, when you reset a Custom
 ;; Theme, you have to specify the theme to reset it to.  We just apply