Mercurial > emacs
diff lisp/font-lock.el @ 83218:47f53c5c9620
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-608
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-609
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-610
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-45
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-258
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 12 Oct 2004 07:52:25 +0000 |
| parents | 22658e29bd48 1b88b2a7544f |
| children | 3ec251523b3e |
line wrap: on
line diff
--- a/lisp/font-lock.el Sun Oct 10 18:11:21 2004 +0000 +++ b/lisp/font-lock.el Tue Oct 12 07:52:25 2004 +0000 @@ -1324,6 +1324,12 @@ (add-text-properties start end (cddr val)) (setq val (cadr val))) (cond + ((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 + ;; changed from <face> to (<face>) which is undesirable. --Stef + nil) ((not override) ;; Cannot override existing fontification. (or (text-property-not-all start end 'face nil)