(move-file-to-trash): Bind backup-directory-alist to nil before
authorChong Yidong <cyd@stupidchicken.com>
Sun, 28 Dec 2008 03:24:53 +0000 (03:24 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 28 Dec 2008 03:24:53 +0000 (03:24 +0000)
uniquifying backup trash file name.

lisp/files.el

index f8ebaa6..1f1640e 100644 (file)
@@ -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)