From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 28 Aug 1999 18:23:14 +0000 (+0000)
Subject: (dired-string-replace-match): Return `nil' when no match
X-Git-Tag: emacs-pretest-21.0.90~7026
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b976e099be16b765534aa96758d4c829c6dc8968;p=emacs.git

(dired-string-replace-match): Return `nil' when no match
found with global search.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index c493c1598ba..c514fa2e31f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1315,12 +1315,12 @@ If it does not match, nil is returned instead of the new string.
 Optional arg LITERAL means to take NEWTEXT literally.
 Optional arg GLOBAL means to replace all matches."
   (if global
-      (let ((start 0))
+      (let ((start 0) ret)
 	(while (string-match regexp string start)
 	  (let ((from-end (- (length string) (match-end 0))))
-	    (setq string (replace-match newtext t literal string))
+	    (setq ret (setq string (replace-match newtext t literal string)))
 	    (setq start (- (length string) from-end))))
-	  string)
+	  ret)
     (if (not (string-match regexp string 0))
 	nil
       (replace-match newtext t literal string))))