mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-23 13:27:36 +00:00
(dired-overwrite-confirmed): Supply initial value.
This commit is contained in:
parent
6bf99ef37a
commit
bbfe23084e
1 changed files with 10 additions and 11 deletions
|
|
@ -1179,23 +1179,22 @@ Special value `always' suppresses confirmation."
|
|||
(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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue