From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 28 Dec 2008 03:24:53 +0000 (+0000)
Subject: (move-file-to-trash): Bind backup-directory-alist to nil before
X-Git-Tag: emacs-pretest-23.0.90~845
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5ac5779a4bc0ef96d39eda5ca0cee80f5ee0191;p=emacs.git

(move-file-to-trash): Bind backup-directory-alist to nil before
uniquifying backup trash file name.
---

diff --git a/lisp/files.el b/lisp/files.el
index f8ebaa6c605..1f1640e24ba 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5992,7 +5992,8 @@ Returns nil on success."
       (and (file-exists-p new-fn)
            ;; make new-fn unique.
            ;; example: "~/.Trash/abc.txt" -> "~/.Trash/abc.txt.~1~"
-           (let ((version-control t))
+           (let ((version-control t)
+		 (backup-directory-alist nil))
              (setq new-fn (car (find-backup-file-name new-fn)))))
       ;; stop processing if fn is same or parent directory of trash-dir.
       (and (string-match fn trash-dir)