From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 11 Oct 2004 14:56:50 +0000 (+0000)
Subject: (font-lock-apply-highlight): Fix last change.
X-Git-Tag: ttn-vms-21-2-B4~4627
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5f48305f15e30fd99159b15a551f98ed446c030;p=emacs.git

(font-lock-apply-highlight): Fix last change.
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 56a4005a41c..83b7516604d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1324,7 +1324,7 @@ HIGHLIGHT should be of the form MATCH-HIGHLIGHT, see `font-lock-keywords'."
 	  (add-text-properties start end (cddr val))
 	  (setq val (cadr val)))
 	(cond
-	 ((not val)
+	 ((not (or val (eq override t)))
 	  ;; If `val' is nil, don't do anything.  It is important to do it
 	  ;; explicitly, because when adding nil via things like
 	  ;; font-lock-append-text-property, the property is actually