From: Shingo Tanaka <shingo.fg8@gmail.com>
Date: Fri, 25 Oct 2019 13:59:28 +0000 (+0900)
Subject: Fix moving files with duplicate names to trash-can
X-Git-Tag: emacs-27.0.90~597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6a9b3061f90313dfc58e3aa85d60c0a966b50dd;p=emacs.git

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 448e00cbd75..bb77dcb3c7e 100644
--- 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)