From: Lars Hansen <larsh@soem.dk>
Date: Sun, 25 Jul 2004 19:55:21 +0000 (+0000)
Subject: (wdired-finish-edit): Require dired-aux before locally binding dired-backup-overwrite.
X-Git-Tag: ttn-vms-21-2-B4~5388
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e0db2366e7a4bd0719b8a0e7899f294243a6c946;p=emacs.git

(wdired-finish-edit): Require dired-aux before locally binding dired-backup-overwrite.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65648fbf3cb..73c833245f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-25  Lars Hansen  <larsh@math.ku.dk>
+
+	* wdired.el (wdired-finish-edit): Require dired-aux before locally
+	binding dired-backup-overwrite.
+
 2004-07-25  John Paul Wallington  <jpw@gnu.org>
 
 	* subr.el (butlast, event-modifiers, event-basic-type): Doc fixes.
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 30ba2a3cd45..928ecd65339 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -455,6 +455,11 @@ non-nil means return old filename."
 		  (setq file-new (substitute-in-file-name file-new))
 		  (if wdired-use-interactive-rename
 		      (wdired-search-and-rename file-ori file-new)
+                    ;; If dired-rename-file autoloads dired-aux while
+                    ;; dired-backup-overwrite is locally bound,
+                    ;; dired-backup-overwrite won't be initialized.
+                    ;; So we must ensure dired-aux is loaded.
+                    (require 'dired-aux)
 		    (condition-case err
 			(let ((dired-backup-overwrite nil))
 			  (dired-rename-file file-ori file-new