From: Codruț Constantin Gușoi <mail@codrut.pro>
Date: Sat, 8 May 2021 11:40:03 +0000 (+0200)
Subject: Fix moving directories with the same name to trash
X-Git-Tag: emacs-28.0.90~2555
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f618cc5bc83d3822759c5bb85d15320651ca2431;p=emacs.git

Fix moving directories with the same name to trash

* lisp/files.el (move-file-to-trash): Allow moving several
directories with the same name to Trash (bug#48280).

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/files.el b/lisp/files.el
index 93a0e07aba0..da33ee815fe 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7932,7 +7932,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions,
                         (expand-file-name files-base trash-files-dir))
                    (setq overwrite t
                          files-base (file-name-nondirectory
-                                     (make-temp-file
+                                     (make-temp-name
                                       (expand-file-name
                                        files-base trash-files-dir)))))
 		 (setq info-fn (expand-file-name