From acedc3e30b2e4377d1050914bb41b7ba58fe99df Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 21 Jul 1995 05:05:49 +0000 Subject: [PATCH] (font-lock-make-faces): Redo logic for whether to call font-lock-make-face for a given face. --- lisp/font-lock.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 51cdb033d28..2b5f603973f 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -307,12 +307,12 @@ See `font-lock-make-face' and `list-faces-display'." ;; Now make the faces if we have to. (mapcar (function (lambda (face-attributes) (let ((face (nth 0 face-attributes))) - (if (and (not override) (facep face)) - ;; The face exists. Only set the variable if it's nil. - (if (or (not (boundp face)) (symbol-value face)) - (set face face)) - ;; The face doesn't exist or we can stomp all over it anyway. - (font-lock-make-face face-attributes))))) + (if override + (font-lock-make-face face-attributes) + (if (not (and (boundp face) (facep (symbol-value face)))) + (if (facep face) + (set face face) + (font-lock-make-face face-attributes))))))) font-lock-face-attributes)) (defun font-lock-make-face (face-attributes) -- 2.39.2