diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/cus-face.el | 21 |
2 files changed, 16 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d6075ce27f..340c8c796b1 100644 --- 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 09cf058dc64..92274dcbe21 100644 --- 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 |