]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix moving directories with the same name to trash
authorCodruț Constantin Gușoi <mail@codrut.pro>
Sat, 8 May 2021 11:40:03 +0000 (13:40 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Sat, 8 May 2021 11:40:03 +0000 (13:40 +0200)
* lisp/files.el (move-file-to-trash): Allow moving several
directories with the same name to Trash (bug#48280).

Copyright-paperwork-exempt: yes

lisp/files.el

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