[Emacs-diffs] Changes to emacs/lisp/font-lock.el

[Stefan Monnier]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.277 emacs/lisp/font-lock.el:1.278
*** emacs/lisp/font-lock.el:1.277       Fri Oct 21 06:29:52 2005
--- emacs/lisp/font-lock.el     Fri Oct 21 17:41:54 2005
***************
*** 1048,1055 ****
            (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))
                     (get-text-property (1- beg) 'font-lock-multiline))
            ;; We are just after or in a multiline match.
            (setq beg (or (previous-single-property-change
--- 1048,1054 ----
            (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 (> 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,1066 ****
                          (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))))
          (goto-char end)
          ;; Round up to a whole line.
            (unless (bolp) (setq end (line-beginning-position 2)))
--- 1056,1064 ----
                          (point-min)))
            (goto-char beg)
            (setq beg (line-beginning-position)))
!           (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)))