From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 8 May 2021 11:42:51 +0000 (+0200)
Subject: Revert "Fix moving directories with the same name to trash"
X-Git-Tag: emacs-28.0.90~2554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6757d10e859a6a71020369bbbc822272bc0540b;p=emacs.git

Revert "Fix moving directories with the same name to trash"

This reverts commit f618cc5bc83d3822759c5bb85d15320651ca2431.

This patch doesn't cover some corner cases, I think.
---

diff --git a/lisp/files.el b/lisp/files.el
index da33ee815fe..93a0e07aba0 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-name
+                                     (make-temp-file
                                       (expand-file-name
                                        files-base trash-files-dir)))))
 		 (setq info-fn (expand-file-name