Mercurial > emacs
comparison lisp/font-lock.el @ 57433:1b88b2a7544f
(font-lock-apply-highlight): Fix last change.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 11 Oct 2004 14:56:50 +0000 |
| parents | 05afd8f1212e |
| children | 5451548f1bd9 47f53c5c9620 ff0e824afa37 |
comparison
equal
deleted
inserted
replaced
| 57432:d95ac5c74632 | 57433:1b88b2a7544f |
|---|---|
| 1322 (let ((val (eval (nth 1 highlight)))) | 1322 (let ((val (eval (nth 1 highlight)))) |
| 1323 (when (eq (car-safe val) 'face) | 1323 (when (eq (car-safe val) 'face) |
| 1324 (add-text-properties start end (cddr val)) | 1324 (add-text-properties start end (cddr val)) |
| 1325 (setq val (cadr val))) | 1325 (setq val (cadr val))) |
| 1326 (cond | 1326 (cond |
| 1327 ((not val) | 1327 ((not (or val (eq override t))) |
| 1328 ;; If `val' is nil, don't do anything. It is important to do it | 1328 ;; If `val' is nil, don't do anything. It is important to do it |
| 1329 ;; explicitly, because when adding nil via things like | 1329 ;; explicitly, because when adding nil via things like |
| 1330 ;; font-lock-append-text-property, the property is actually | 1330 ;; font-lock-append-text-property, the property is actually |
| 1331 ;; changed from <face> to (<face>) which is undesirable. --Stef | 1331 ;; changed from <face> to (<face>) which is undesirable. --Stef |
| 1332 nil) | 1332 nil) |