From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 21 Jul 1995 05:05:49 +0000 (+0000)
Subject: (font-lock-make-faces): Redo logic for whether
X-Git-Tag: emacs-19.34~3233
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acedc3e30b2e4377d1050914bb41b7ba58fe99df;p=emacs.git

(font-lock-make-faces): Redo logic for whether
to call font-lock-make-face for a given face.
---

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)