comparison lisp/dired-aux.el @ 93761:673422b6cd01

(dired-overwrite-confirmed): Supply initial value.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 06 Apr 2008 00:03:38 +0000
parents 4525730eae72
children 2172dd8304ae
comparison
equal deleted inserted replaced
93760:dbd33455757e 93761:673422b6cd01
1177 :type '(choice (const :tag "off" nil) 1177 :type '(choice (const :tag "off" nil)
1178 (const :tag "suppress" always) 1178 (const :tag "suppress" always)
1179 (other :tag "ask" t)) 1179 (other :tag "ask" t))
1180 :group 'dired) 1180 :group 'dired)
1181 1181
1182 (defvar dired-overwrite-confirmed) 1182 (defvar dired-overwrite-confirmed nil)
1183 1183
1184 (defun dired-handle-overwrite (to) 1184 (defun dired-handle-overwrite (to)
1185 ;; Save old version of file TO that is to be overwritten. 1185 ;; Save old version of file TO that is to be overwritten.
1186 ;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars 1186 ;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars
1187 ;; from dired-create-files. 1187 ;; from dired-create-files.
1188 (let (backup) 1188 (let (backup)
1189 (if (and dired-backup-overwrite 1189 (when (and dired-backup-overwrite
1190 dired-overwrite-confirmed 1190 dired-overwrite-confirmed
1191 (setq backup (car (find-backup-file-name to))) 1191 (setq backup (car (find-backup-file-name to)))
1192 (or (eq 'always dired-backup-overwrite) 1192 (or (eq 'always dired-backup-overwrite)
1193 (dired-query 'overwrite-backup-query 1193 (dired-query 'overwrite-backup-query
1194 "Make backup for existing file `%s'? " 1194 "Make backup for existing file `%s'? "
1195 to))) 1195 to)))
1196 (progn 1196 (rename-file to backup 0) ; confirm overwrite of old backup
1197 (rename-file to backup 0) ; confirm overwrite of old backup 1197 (dired-relist-entry backup))))
1198 (dired-relist-entry backup)))))
1199 1198
1200 ;;;###autoload 1199 ;;;###autoload
1201 (defun dired-copy-file (from to ok-flag) 1200 (defun dired-copy-file (from to ok-flag)
1202 (dired-handle-overwrite to) 1201 (dired-handle-overwrite to)
1203 (dired-copy-file-recursive from to ok-flag dired-copy-preserve-time t 1202 (dired-copy-file-recursive from to ok-flag dired-copy-preserve-time t