[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.246 emacs/lisp/font-lock.el:1.247
*** emacs/lisp/font-lock.el:1.246       Tue May 10 09:01:23 2005
--- emacs/lisp/font-lock.el     Wed May 11 15:55:16 2005
***************
*** 1420,1425 ****
--- 1420,1426 ----
    (let ((case-fold-search font-lock-keywords-case-fold-search)
        (keywords (cddr font-lock-keywords))
        (bufname (buffer-name)) (count 0)
+         (pos (make-marker))
        keyword matcher highlights)
      ;;
      ;; Fontify each item in `font-lock-keywords' from `start' to `end'.
***************
*** 1454,1465 ****
        (while highlights
          (if (numberp (car (car highlights)))
              (font-lock-apply-highlight (car highlights))
!           (let ((pos (point)))
!             (font-lock-fontify-anchored-keywords (car highlights) end)
!             ;; Ensure forward progress.
!             (if (< (point) pos) (goto-char pos))))
          (setq highlights (cdr highlights))))
!       (setq keywords (cdr keywords)))))
  
  ;;; End of Keyword regexp fontification functions.
  
--- 1455,1468 ----
        (while highlights
          (if (numberp (car (car highlights)))
              (font-lock-apply-highlight (car highlights))
!           (set-marker pos (point))
!             (font-lock-fontify-anchored-keywords (car highlights) end)
!             ;; Ensure forward progress.  `pos' is a marker because anchored
!             ;; keyword may add/delete text (this happens e.g. in grep.el).
!             (if (< (point) pos) (goto-char pos)))
          (setq highlights (cdr highlights))))
!       (setq keywords (cdr keywords)))
!     (set-marker pos nil)))
  
  ;;; End of Keyword regexp fontification functions.