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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65648fbf3cb95d37b1f190052eb8fadd1b3f5dd1..73c833245f80f3976c6337162145e88527370e98 100644 (file)
--- 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 30ba2a3cd4541737b3121639e1715669ee924992..928ecd653395c10ef32176ab6226a0c3fa140dff 100644 (file)
--- 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