Commit 3102b342 authored by Glenn Morris's avatar Glenn Morris

David De La Harpe Golden <david at harpegolden.net>

(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.
parent 8cf5507b
2008-09-20 David De La Harpe Golden <david@harpegolden.net>
* files.el (move-file-to-trash): Avoid recursive trashing if
rename-file calls delete-file.
2008-09-20 Glenn Morris <rgm@gnu.org>
* play/fortune.el: Remove leading `*' from defcustom docs.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment