diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-09-20 21:28:34 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-09-20 21:28:34 +0000 |
| commit | 978312f44a025cb4da6904a85eed24d2e696c6ca (patch) | |
| tree | 0a36764d5f29fc00b9f0311ea994d4f7977af1f2 | |
| parent | 2dc57dffbaf2a904a32c73c1cf287a8e72e7ac26 (diff) | |
| download | emacs-978312f44a025cb4da6904a85eed24d2e696c6ca.tar.gz | |
David De La Harpe Golden <david at harpegolden.net>
(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.
| -rw-r--r-- | lisp/files.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el index 06a3e28768b..03a3a03cbb2 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5828,7 +5828,8 @@ Returns nil on success." (and (string-match fn trash-dir) (error "Filename `%s' is same or parent directory of trash-directory" filename)) - (rename-file fn new-fn))))) + (let ((delete-by-moving-to-trash nil)) + (rename-file fn new-fn)))))) (define-key ctl-x-map "\C-f" 'find-file) |