diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-12-28 03:24:53 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-12-28 03:24:53 +0000 |
| commit | d5ac5779a4bc0ef96d39eda5ca0cee80f5ee0191 (patch) | |
| tree | a6124423d0ce0382c62f88928ad3c4d00bfdd6a8 /lisp | |
| parent | 7d96af1ab4d9e76259b4d32a63ea05cf4ec6ff2f (diff) | |
| download | emacs-d5ac5779a4bc0ef96d39eda5ca0cee80f5ee0191.tar.gz emacs-d5ac5779a4bc0ef96d39eda5ca0cee80f5ee0191.tar.bz2 emacs-d5ac5779a4bc0ef96d39eda5ca0cee80f5ee0191.zip | |
(move-file-to-trash): Bind backup-directory-alist to nil before
uniquifying backup trash file name.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/files.el | 3 |
1 files changed, 2 insertions, 1 deletions
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) |