Mercurial > emacs
comparison lisp/files.el @ 98274:7d8f4fcd876c
David De La Harpe Golden <david at harpegolden.net>
(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 20 Sep 2008 21:28:34 +0000 |
| parents | ed0350198b43 |
| children | 05e41fd49efc |
comparison
equal
deleted
inserted
replaced
| 98273:e3ddbeb0a61f | 98274:7d8f4fcd876c |
|---|---|
| 5826 (setq new-fn (car (find-backup-file-name new-fn))))) | 5826 (setq new-fn (car (find-backup-file-name new-fn))))) |
| 5827 ;; stop processing if fn is same or parent directory of trash-dir. | 5827 ;; stop processing if fn is same or parent directory of trash-dir. |
| 5828 (and (string-match fn trash-dir) | 5828 (and (string-match fn trash-dir) |
| 5829 (error "Filename `%s' is same or parent directory of trash-directory" | 5829 (error "Filename `%s' is same or parent directory of trash-directory" |
| 5830 filename)) | 5830 filename)) |
| 5831 (rename-file fn new-fn))))) | 5831 (let ((delete-by-moving-to-trash nil)) |
| 5832 (rename-file fn new-fn)))))) | |
| 5832 | 5833 |
| 5833 | 5834 |
| 5834 (define-key ctl-x-map "\C-f" 'find-file) | 5835 (define-key ctl-x-map "\C-f" 'find-file) |
| 5835 (define-key ctl-x-map "\C-r" 'find-file-read-only) | 5836 (define-key ctl-x-map "\C-r" 'find-file-read-only) |
| 5836 (define-key ctl-x-map "\C-v" 'find-alternate-file) | 5837 (define-key ctl-x-map "\C-v" 'find-alternate-file) |