From 70a267c9b5ba42f7908b31286de055046c6df907 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 7 Sep 2000 09:50:30 +0000 Subject: [PATCH] (set-face-attribute): Simplify by calling internal-set-lisp-face-attribute with FRAME being 0. --- lisp/faces.el | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index aaf5c1a5e96..d4c27ffb0c3 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -546,26 +546,13 @@ must be t or nil in that case. A value of `unspecified' is not allowed. VALUE is the name of a face from which to inherit attributes, or a list of face names. Attributes from inherited faces are merged into the face like an underlying face would be, with higher priority than underlying faces." - (setq args (purecopy args)) - (cond ((null frame) - ;; Change face on all frames. - (dolist (frame (frame-list)) - (let ((list args)) - (while list - (internal-set-lisp-face-attribute face (car list) - (cadr list) frame) - (setq list (cdr (cdr list)))))) - ;; Record that as a default for new frames. - (while args - (internal-set-lisp-face-attribute face (car args) - (cadr args) t) - (setq args (cdr (cdr args))))) - (t - (while args - (internal-set-lisp-face-attribute face (car args) - (purecopy (cadr args)) - frame) - (setq args (cdr (cdr args))))))) + (let ((where (if (null frame) 0 frame))) + (setq args (purecopy args)) + (while args + (internal-set-lisp-face-attribute face (car args) + (purecopy (cadr args)) + where) + (setq args (cdr (cdr args)))))) (defun make-face-bold (face &optional frame noerror) -- 2.39.2