diff options
| author | Stefan Monnier | 2004-10-11 14:56:50 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2004-10-11 14:56:50 +0000 |
| commit | a5f48305f15e30fd99159b15a551f98ed446c030 (patch) | |
| tree | fe41d7bdde9801a53722301b10d79c14004b58b9 | |
| parent | 29fabd8cee50416f35fee189822f48b9d9ea19de (diff) | |
| download | emacs-a5f48305f15e30fd99159b15a551f98ed446c030.tar.gz emacs-a5f48305f15e30fd99159b15a551f98ed446c030.zip | |
(font-lock-apply-highlight): Fix last change.
| -rw-r--r-- | lisp/font-lock.el | 2 |
1 files changed, 1 insertions, 1 deletions
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'." | |||
| 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 |