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

(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec29db2649a3a66284a7564d96a1fba3884a25a7..4617cf81427fa2b539af01ae716ed460af1aa5fe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/files.el b/lisp/files.el
index 06a3e28768b61062cd39ee2c997baeb58d56f401..03a3a03cbb20d5df16135287641825efc7d4fe2f 100644 (file)
--- 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))))))
 
 \f
 (define-key ctl-x-map "\C-f" 'find-file)