mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-28 19:42:02 +00:00
Code Issues Releases Activity

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

Browse Source 
Fixes: debbugs:7593
This commit is contained in:
Chong Yidong 2013-12-18 13:10:58 +08:00
parent 83c60f60bf
commit 50ff2e0675
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -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

4
lisp/replace.el
View File

@ -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.