From a6757d10e859a6a71020369bbbc822272bc0540b Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 8 May 2021 13:42:51 +0200 Subject: [PATCH] Revert "Fix moving directories with the same name to trash" This reverts commit f618cc5bc83d3822759c5bb85d15320651ca2431. This patch doesn't cover some corner cases, I think. --- lisp/files.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.2