diff options
| -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." | |||
| 5992 | (and (file-exists-p new-fn) | 5992 | (and (file-exists-p new-fn) |
| 5993 | ;; make new-fn unique. | 5993 | ;; make new-fn unique. |
| 5994 | ;; example: "~/.Trash/abc.txt" -> "~/.Trash/abc.txt.~1~" | 5994 | ;; example: "~/.Trash/abc.txt" -> "~/.Trash/abc.txt.~1~" |
| 5995 | (let ((version-control t)) | 5995 | (let ((version-control t) |
| 5996 | (backup-directory-alist nil)) | ||
| 5996 | (setq new-fn (car (find-backup-file-name new-fn))))) | 5997 | (setq new-fn (car (find-backup-file-name new-fn))))) |
| 5997 | ;; stop processing if fn is same or parent directory of trash-dir. | 5998 | ;; stop processing if fn is same or parent directory of trash-dir. |
| 5998 | (and (string-match fn trash-dir) | 5999 | (and (string-match fn trash-dir) |