diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-10-21 17:41:54 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-10-21 17:41:54 +0000 |
| commit | 5ae158bf21d620f7c0d275e8b9719ad0c6df156a (patch) | |
| tree | 97f94833de369fbbd0a16ed0a3ba783b16ddeea6 | |
| parent | 45158e77762545109935cad79450d0cda8905976 (diff) | |
| download | emacs-5ae158bf21d620f7c0d275e8b9719ad0c6df156a.tar.gz | |
(font-lock-default-fontify-region): Check the multiline
property independently from the font-lock-multiline variable.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/font-lock.el | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 219fbe0213a..2a83266af32 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-21 Stefan Monnier <monnier@iro.umontreal.ca> + + * font-lock.el (font-lock-default-fontify-region): Check the multiline + property independently from the font-lock-multiline variable. + 2005-10-21 Richard M. Stallman <rms@gnu.org> * emacs-lisp/find-func.el (find-library-name): Doc fix. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 77e20d5d026..ed8e7143b25 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1048,8 +1048,7 @@ a very meaningful entity to highlight.") (setq beg (line-beginning-position (- 1 font-lock-lines-before))) ;; check to see if we should expand the beg/end area for ;; proper multiline matches - (when (and font-lock-multiline - (> beg (point-min)) + (when (and (> beg (point-min)) (get-text-property (1- beg) 'font-lock-multiline)) ;; We are just after or in a multiline match. (setq beg (or (previous-single-property-change @@ -1057,10 +1056,9 @@ a very meaningful entity to highlight.") (point-min))) (goto-char beg) (setq beg (line-beginning-position))) - (when font-lock-multiline - (setq end (or (text-property-any end (point-max) - 'font-lock-multiline nil) - (point-max)))) + (setq end (or (text-property-any end (point-max) + 'font-lock-multiline nil) + (point-max))) (goto-char end) ;; Round up to a whole line. (unless (bolp) (setq end (line-beginning-position 2))) |