changeset 6145:843ce3f872c2

(copy-face): Don't change old-face and new-face before the frame loop.
author Karl Heuer <kwzh@gnu.org>
date Wed, 02 Mar 1994 06:45:38 +0000
parents 714b670eac42
children 1a2a8ef9b4af
files lisp/faces.el
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Wed Mar 02 05:59:09 1994 +0000
+++ b/lisp/faces.el	Wed Mar 02 06:45:38 1994 +0000
@@ -308,16 +308,16 @@
 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)