aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2008-06-15 09:43:38 +0000
committerAndreas Schwab2008-06-15 09:43:38 +0000
commit390b0feef55157621ea195daed474dca99fd74a0 (patch)
treea98e047475f9a9dc9248e45d00a66a1f262b9173
parent0d00764ae592431354fd21d62819233721390af6 (diff)
downloademacs-390b0feef55157621ea195daed474dca99fd74a0.tar.gz
emacs-390b0feef55157621ea195daed474dca99fd74a0.zip
(wdired-search-and-rename): Fix undocumented change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/wdired.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e6b3e019cb..158523bc7ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-06-15 Andreas Schwab <schwab@suse.de>
2
3 * wdired.el (wdired-search-and-rename): Fix undocumented change.
4
12008-06-15 Ulf Jasper <ulf@web.de> 52008-06-15 Ulf Jasper <ulf@web.de>
2 6
3 * net/newst-plainview.el (newsticker-faces, newsticker-feed-face) 7 * net/newst-plainview.el (newsticker-faces, newsticker-feed-face)
diff --git a/lisp/wdired.el b/lisp/wdired.el
index fe14bce1785..e2d6a4b85b8 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -503,12 +503,11 @@ and proceed depending on the answer."
503 (setq curr-filename (wdired-get-filename nil t)) 503 (setq curr-filename (wdired-get-filename nil t))
504 (if (equal curr-filename filename-ori) 504 (if (equal curr-filename filename-ori)
505 (progn 505 (progn
506 (setq exit-while t) 506 (setq done t)
507 (let ((inhibit-read-only t)) 507 (let ((inhibit-read-only t))
508 (dired-move-to-filename) 508 (dired-move-to-filename)
509 (search-forward (wdired-get-filename t) nil t) 509 (search-forward (wdired-get-filename t) nil t)
510 (replace-match (file-name-nondirectory filename-ori) t t)) 510 (replace-match (file-name-nondirectory filename-ori) t t))
511 (setq done)
512 (dired-do-create-files-regexp 511 (dired-do-create-files-regexp
513 (function dired-rename-file) 512 (function dired-rename-file)
514 "Move" 1 ".*" filename-new nil t)) 513 "Move" 1 ".*" filename-new nil t))