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 da33ee815fee13a7222a5ae77ac2a1a85093be76..93a0e07aba0b774ea8bc3d350c25f4e6dd4c42e6 100644 (file)
--- 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