Mercurial > emacs
diff lisp/font-lock.el @ 66291:66e915f36067
(font-lock-default-fontify-region): Check the multiline
property independently from the font-lock-multiline variable.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 21 Oct 2005 17:41:54 +0000 |
parents | edfe61dd2874 |
children | 7f93058a1608 732c5740ca8f 0ca0d9181b5e |
line wrap: on
line diff
--- a/lisp/font-lock.el Fri Oct 21 17:25:58 2005 +0000 +++ b/lisp/font-lock.el Fri Oct 21 17:41:54 2005 +0000 @@ -1048,8 +1048,7 @@ (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 @@ (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)))