diff options
| -rw-r--r-- | lisp/dired-aux.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index dca2ca488ed..69ea15922c4 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -925,14 +925,16 @@ Special value `always' suppresses confirmation.") | |||
| 925 | ;; Save old version of a to be overwritten file TO. | 925 | ;; Save old version of a to be overwritten file TO. |
| 926 | ;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars | 926 | ;; `dired-overwrite-confirmed' and `overwrite-backup-query' are fluid vars |
| 927 | ;; from dired-create-files. | 927 | ;; from dired-create-files. |
| 928 | (if (and dired-backup-overwrite | 928 | (let (backup) |
| 929 | dired-overwrite-confirmed | 929 | (if (and dired-backup-overwrite |
| 930 | (or (eq 'always dired-backup-overwrite) | 930 | dired-overwrite-confirmed |
| 931 | (dired-query 'overwrite-backup-query | 931 | (setq backup (car (find-backup-file-name to))) |
| 932 | (format "Make backup for existing file `%s'? " to)))) | 932 | (or (eq 'always dired-backup-overwrite) |
| 933 | (let ((backup (car (find-backup-file-name to)))) | 933 | (dired-query 'overwrite-backup-query |
| 934 | (rename-file to backup 0) ; confirm overwrite of old backup | 934 | (format "Make backup for existing file `%s'? " to)))) |
| 935 | (dired-relist-entry backup)))) | 935 | (progn |
| 936 | (rename-file to backup 0) ; confirm overwrite of old backup | ||
| 937 | (dired-relist-entry backup))))) | ||
| 936 | 938 | ||
| 937 | ;;;###autoload | 939 | ;;;###autoload |
| 938 | (defun dired-copy-file (from to ok-flag) | 940 | (defun dired-copy-file (from to ok-flag) |