[Emacs-diffs] emacs/lisp files.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/12/28 03:24:53

Modified files:
        lisp           : files.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1028&r2=1.1029

Patches:
Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1028
retrieving revision 1.1029
diff -u -b -r1.1028 -r1.1029
--- files.el    26 Dec 2008 17:59:48 -0000      1.1028
+++ files.el    28 Dec 2008 03:24:53 -0000      1.1029
@@ -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)