summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1994-03-02 06:45:38 +0000
committerKarl Heuer <kwzh@gnu.org>1994-03-02 06:45:38 +0000
commit12ea503fb611b9b8a03b84f80909d4a5036e2b98 (patch)
treec1a9c95555f7a610acdfe0fc512d1f13bfc978b2 /lisp/faces.el
parent5536528785ac0f6dd3e06810d637237fbb786d3b (diff)
downloademacs-12ea503fb611b9b8a03b84f80909d4a5036e2b98.tar.gz
(copy-face): Don't change old-face and new-face before the frame loop.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 0bc1ed0a777..891a37c24aa 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -308,16 +308,16 @@ If the optional fourth argument NEW-FRAME is given,
copy the information from face OLD-FACE on frame FRAME
to NEW-FACE on frame NEW-FRAME."
(or new-frame (setq new-frame frame))
- (setq old-face (internal-get-face old-face frame))
- (let* ((inhibit-quit t)
- (new-face (or (internal-find-face new-face new-frame)
- (make-face new-face))))
+ (let ((inhibit-quit t))
(if (null frame)
(let ((frames (frame-list)))
(while frames
(copy-face old-face new-face (car frames))
(setq frames (cdr frames)))
(copy-face old-face new-face t))
+ (setq old-face (internal-get-face old-face frame))
+ (setq new-face (or (internal-find-face new-face new-frame)
+ (make-face new-face)))
(set-face-font new-face (face-font old-face frame) new-frame)
(set-face-foreground new-face (face-foreground old-face frame) new-frame)
(set-face-background new-face (face-background old-face frame) new-frame)