Fix moving files with duplicate names to trash-can

* lisp/files.el (move-file-to-trash): Fix file name in
trash-can when another deleted file under the same name is
already stored there.  (Bug#37922)

Copyright-paperwork-exempt: yes.

diff --git a/lisp/files.el b/lisp/files.el
index 448e00cbd75c0fe7b6593321f421866a58408b36..bb77dcb3c7e115f5cb2f4f68d50a4f29651e1d64 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7711,7 +7711,8 @@ Otherwise, trash FILENAME using the freedesktop.org conventions,
                    (setq info-fn (make-temp-file
                                   (expand-file-name files-base trash-info-dir)
                                   nil ".trashinfo"))
-                   (setq files-base (file-name-nondirectory info-fn))
+                   (setq files-base (substring (file-name-nondirectory info-fn)
+                                                0 (- (length ".trashinfo"))))
                    (write-region nil nil info-fn nil 'quiet info-fn)))
                 ;; Finally, try to move the file to the trashcan.
                 (let ((delete-by-moving-to-trash nil)