From: Karl Heuer <kwzh@gnu.org>
Date: Wed, 2 Mar 1994 06:45:38 +0000 (+0000)
Subject: (copy-face): Don't change old-face and new-face before the frame loop.
X-Git-Tag: emacs-19.34~9707
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da41135a678cea39bd3ef9797b9f989ed5c0f650;p=emacs.git

(copy-face): Don't change old-face and new-face before the frame loop.
---

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)