[Emacs-diffs] trunk r115586: * replace.el (occur-engine): Avoid infloop.

[Chong Yidong]

------------------------------------------------------------
revno: 115586
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/7593
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-18 13:10:58 +0800
message:
  * replace.el (occur-engine): Avoid infloop.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/replace.el                replace.el-20091113204419-o5vbwnq5f7feedwu-119

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-18 05:01:30 +0000
+++ b/lisp/ChangeLog    2013-12-18 05:10:58 +0000
@@ -1,3 +1,7 @@
+2013-12-18  Chong Yidong  <address@hidden>
+
+       * replace.el (occur-engine): Avoid infloop (Bug#7593).
+
 2013-12-18  Kazuhiro Ito  <address@hidden>  (tiny change)
 
        * progmodes/make-mode.el (makefile-fill-paragraph): Fix infloop

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-11-30 08:42:28 +0000
+++ b/lisp/replace.el   2013-12-18 05:10:58 +0000
@@ -1457,7 +1457,9 @@
                            ;; 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.