(font-lock-fontify-keywords-region): Ensure forward

progress, even with buggy anchored keywords.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d65a446a376a8ddb1affb30d393a681f3df68666..f10a15936b5c41f4ac9e95ee649a027cd336659e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * font-lock.el (font-lock-fontify-keywords-region): Ensure forward
+       progress, even with buggy anchored keywords.
+
 2005-03-05  Luc Teirlinck  <teirllm@auburn.edu>
 
        * simple.el (goto-line): Remove unbalanced final parenthesis.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 90d4aa0adeb83a2c8cd0640724293ce8655f5a53..ceadcf19728f1491e25f49422a96d89f4ec5cb00 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,7 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004 2005  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
@@ -1425,7 +1425,10 @@ LOUDLY, if non-nil, allows progress-meter bar."
        (while highlights
          (if (numberp (car (car highlights)))
              (font-lock-apply-highlight (car highlights))
-           (font-lock-fontify-anchored-keywords (car highlights) end))
+           (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)))))