From 978312f44a025cb4da6904a85eed24d2e696c6ca Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sat, 20 Sep 2008 21:28:34 +0000
Subject: David De La Harpe Golden  <david at harpegolden.net>

(move-file-to-trash): Avoid recursive trashing if rename-file calls delete-file.
---
 lisp/files.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
cgit v1.2.1