# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1207440218 0
# Node ID 673422b6cd01e3771f3757cb86a9630561ec9f2a
# Parent  dbd33455757ede95b3013c8a2b81e2279b9d2542
(dired-overwrite-confirmed): Supply initial value.

diff -r dbd33455757e -r 673422b6cd01 lisp/dired-aux.el
--- a/lisp/dired-aux.el	Sun Apr 06 00:03:24 2008 +0000
+++ b/lisp/dired-aux.el	Sun Apr 06 00:03:38 2008 +0000
@@ -1179,23 +1179,22 @@
 		 (other :tag "ask" t))
   :group 'dired)
 
-(defvar dired-overwrite-confirmed)
+(defvar dired-overwrite-confirmed nil)
 
 (defun dired-handle-overwrite (to)
   ;; Save old version of file TO that is to be overwritten.
   ;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars
   ;; from dired-create-files.
   (let (backup)
-    (if (and dired-backup-overwrite
-	     dired-overwrite-confirmed
-	     (setq backup (car (find-backup-file-name to)))
-	     (or (eq 'always dired-backup-overwrite)
-		 (dired-query 'overwrite-backup-query
-			      "Make backup for existing file `%s'? "
-			      to)))
-	(progn
-	  (rename-file to backup 0)	; confirm overwrite of old backup
-	  (dired-relist-entry backup)))))
+    (when (and dired-backup-overwrite
+	       dired-overwrite-confirmed
+	       (setq backup (car (find-backup-file-name to)))
+	       (or (eq 'always dired-backup-overwrite)
+		   (dired-query 'overwrite-backup-query
+				"Make backup for existing file `%s'? "
+				to)))
+      (rename-file to backup 0)	; confirm overwrite of old backup
+      (dired-relist-entry backup))))
 
 ;;;###autoload
 (defun dired-copy-file (from to ok-flag)