Mercurial > emacs
comparison lisp/dired-aux.el @ 15160:bc35b62c3798
(dired-handle-overwrite): `find-backup-file-name'
may return nil, so handle that.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 04 May 1996 05:30:37 +0000 |
| parents | 9e847303147a |
| children | 16f064c6c276 |
comparison
equal
deleted
inserted
replaced
| 15159:b22de331ee43 | 15160:bc35b62c3798 |
|---|---|
| 923 | 923 |
| 924 (defun dired-handle-overwrite (to) | 924 (defun dired-handle-overwrite (to) |
| 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) |
| 939 (dired-handle-overwrite to) | 941 (dired-handle-overwrite to) |
| 940 (copy-file from to ok-flag dired-copy-preserve-time)) | 942 (copy-file from to ok-flag dired-copy-preserve-time)) |