Commit 5ae158bf authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(font-lock-default-fontify-region): Check the multiline

property independently from the font-lock-multiline variable.
parent 45158e77
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.
......
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment