diff options
| author | Richard M. Stallman | 1995-07-21 05:05:49 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-07-21 05:05:49 +0000 |
| commit | acedc3e30b2e4377d1050914bb41b7ba58fe99df (patch) | |
| tree | df28090ee3419f9caff3a94018c751acaa62a00d | |
| parent | 0314aacb412ab1015f063d31e4b43ef7c6935c9e (diff) | |
| download | emacs-acedc3e30b2e4377d1050914bb41b7ba58fe99df.tar.gz emacs-acedc3e30b2e4377d1050914bb41b7ba58fe99df.zip | |
(font-lock-make-faces): Redo logic for whether
to call font-lock-make-face for a given face.
| -rw-r--r-- | lisp/font-lock.el | 12 |
1 files 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'." | |||
| 307 | ;; Now make the faces if we have to. | 307 | ;; Now make the faces if we have to. |
| 308 | (mapcar (function (lambda (face-attributes) | 308 | (mapcar (function (lambda (face-attributes) |
| 309 | (let ((face (nth 0 face-attributes))) | 309 | (let ((face (nth 0 face-attributes))) |
| 310 | (if (and (not override) (facep face)) | 310 | (if override |
| 311 | ;; The face exists. Only set the variable if it's nil. | 311 | (font-lock-make-face face-attributes) |
| 312 | (if (or (not (boundp face)) (symbol-value face)) | 312 | (if (not (and (boundp face) (facep (symbol-value face)))) |
| 313 | (set face face)) | 313 | (if (facep face) |
| 314 | ;; The face doesn't exist or we can stomp all over it anyway. | 314 | (set face face) |
| 315 | (font-lock-make-face face-attributes))))) | 315 | (font-lock-make-face face-attributes))))))) |
| 316 | font-lock-face-attributes)) | 316 | font-lock-face-attributes)) |
| 317 | 317 | ||
| 318 | (defun font-lock-make-face (face-attributes) | 318 | (defun font-lock-make-face (face-attributes) |