[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.268 emacs/lisp/font-lock.el:1.269
*** emacs/lisp/font-lock.el:1.268       Mon Jul  4 23:08:54 2005
--- emacs/lisp/font-lock.el     Wed Jul 13 04:39:14 2005
***************
*** 1473,1479 ****
        (while (and (< (point) end)
                  (if (stringp matcher)
                      (re-search-forward matcher end t)
!                   (funcall matcher end)))
        (when (and font-lock-multiline
                   (>= (point)
                       (save-excursion (goto-char (match-beginning 0))
--- 1473,1483 ----
        (while (and (< (point) end)
                  (if (stringp matcher)
                      (re-search-forward matcher end t)
!                   (funcall matcher end))
!                   ;; Beware empty string matches since they will
!                   ;; loop indefinitely.
!                   (or (> (point) (match-beginning 0))
!                       (progn (forward-char 1) t)))
        (when (and font-lock-multiline
                   (>= (point)
                       (save-excursion (goto-char (match-beginning 0))