diff lisp/replace.el @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 1d62742628b6
children a300bb07d72d
line wrap: on
line diff
--- a/lisp/replace.el	Mon Aug 13 11:01:58 2007 +0200
+++ b/lisp/replace.el	Mon Aug 13 11:03:08 2007 +0200
@@ -377,8 +377,8 @@
 
 If a match spreads across multiple lines, all those lines are shown.
 
-If variable `list-matching-lines-whole-buffer' is non-nil, the entire
-buffer is searched, otherwise search begins at point.
+If variable `list-matching-lines-whole-buffer' is non-nil, the entire buffer is
+searched, otherwise search begins at point.
 
 Each line is displayed with NLINES lines before and after, or -NLINES
 before if NLINES is negative.
@@ -657,7 +657,6 @@
 	;; Loop finding occurrences that perhaps should be replaced.
 	(while (and keep-going
 		    (not (eobp))
-		    (or (null limit) (< (point) limit))
 		    (let ((case-fold-search qr-case-fold-search))
 		      (funcall search-function search-string limit t))
 		    ;; If the search string matches immediately after
@@ -667,8 +666,7 @@
 			    (and regexp-flag
 				 (eq lastrepl (match-beginning 0))
 				 (not match-again)))
-			(if (or (eobp)
-				(and limit (>= (point) limit)))
+			(if (eobp)
 			    nil
 			  ;; Don't replace the null string 
 			  ;; right after end of previous replacement.