From: Chong Yidong <cyd@gnu.org>
Date: Wed, 18 Dec 2013 05:10:58 +0000 (+0800)
Subject: * replace.el (occur-engine): Avoid infloop.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~350
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50ff2e06756b2b0565d3a815efe52be1e7247d0b;p=emacs.git

* replace.el (occur-engine): Avoid infloop.

Fixes: debbugs:7593
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aef7eb5cc5b..e106a763332 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-18  Chong Yidong  <cyd@gnu.org>
+
+	* replace.el (occur-engine): Avoid infloop (Bug#7593).
+
 2013-12-18  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
 	* progmodes/make-mode.el (makefile-fill-paragraph): Fix infloop
diff --git a/lisp/replace.el b/lisp/replace.el
index 061300c7829..2c6b02364b2 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1457,7 +1457,9 @@ See also `multi-occur'."
 			    ;; so as to override faces copied from the buffer.
 			    `(face ,match-face)))
 			 curstring)
-			(setq start (match-end 0))))
+			;; Avoid infloop (Bug#7593).
+			(let ((end (match-end 0)))
+			  (setq start (if (= start end) (1+ start) end)))))
 		    ;; Generate the string to insert for this match
 		    (let* ((match-prefix
 			    ;; Using 7 digits aligns tabs properly.