diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-01-19 13:51:25 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-01-19 13:51:25 +0000 |
| commit | 111c181ec1a0b8bd37a024e5c0d29144810dca22 (patch) | |
| tree | a5f5c1893987a81cee26308000acb157ed1d1e7e /lisp | |
| parent | 3b6936cc6db30e8bf2d1077fb5e0801efebc47fd (diff) | |
| download | emacs-111c181ec1a0b8bd37a024e5c0d29144810dca22.tar.gz | |
(font-lock-default-fontify-region): Fix last
change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/font-lock.el | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b5595103bbb..35326df71f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-01-19 Gerd Moellmann <gerd@gnu.org> + * font-lock.el (font-lock-default-fontify-region): Fix last + change. + * font-lock.el (font-lock-multiline): Default to nil. (font-lock-default-fontify-region): If font-lock-multiline is nil, don't check the property `font-lock-multiline'. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 5316b110995..188b5de7fe8 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1212,10 +1212,10 @@ The value of this variable is used when Font Lock mode is turned on." (point-min))) (goto-char beg) (setq beg (line-beginning-position))) - (setq end (or (and font-lock-multiline - (text-property-any end (point-max) - 'font-lock-multiline nil)) - (point-max))) + (when font-lock-multiline + (setq end (or (text-property-any end (point-max) + 'font-lock-multiline nil) + (point-max)))) (goto-char end) (setq end (line-beginning-position 2)) ;; Now do the fontification. |