# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 806303149 0
# Node ID f9a5365b158ad4fbd484896a7e4312d45b76e42d
# Parent  e2831d2f5b099c03e2f644351bceb2c040dc7f58
(font-lock-make-faces): Redo logic for whether
to call font-lock-make-face for a given face.

diff -r e2831d2f5b09 -r f9a5365b158a lisp/font-lock.el
--- a/lisp/font-lock.el	Fri Jul 21 02:05:20 1995 +0000
+++ b/lisp/font-lock.el	Fri Jul 21 05:05:49 1995 +0000
@@ -307,12 +307,12 @@
   ;; 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)