changeset 100725:0082d8f02c6f

(move-file-to-trash): Bind backup-directory-alist to nil before uniquifying backup trash file name.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 28 Dec 2008 03:24:53 +0000
parents 33e01c52c2b7
children e80f47b0d928
files lisp/files.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/files.el	Sun Dec 28 03:24:19 2008 +0000
+++ b/lisp/files.el	Sun Dec 28 03:24:53 2008 +0000
@@ -5992,7 +5992,8 @@
       (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)