(dired-string-replace-match): Return `nil' when no match

found with global search.

diff --git a/lisp/dired.el b/lisp/dired.el
index c493c1598baf0522456fb6b4443a375d5c348fa5..c514fa2e31f3ea8fde6ba33a94c49d65dcfd437e 100644 (file)
--- 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))))