From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 Jul 2005 04:39:14 +0000 (+0000)
Subject: (font-lock-fontify-keywords-region): Avoid inf-loops
X-Git-Tag: emacs-pretest-22.0.90~8200
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a08764f7a72eb062a85733b045fb50291d6aee9;p=emacs.git

(font-lock-fontify-keywords-region): Avoid inf-loops
when the matched text is empty.
---

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index a1b30292e61..0a97be141df 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1473,7 +1473,11 @@ LOUDLY, if non-nil, allows progress-meter bar."
       (while (and (< (point) end)
 		  (if (stringp matcher)
 		      (re-search-forward matcher end t)
-		    (funcall matcher end)))
+		    (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))