From 3f8b303ec087ba3d0bd524c7fc8c628ef15a3e4a Mon Sep 17 00:00:00 2001 From: Gregory Heytings Date: Tue, 25 May 2021 00:24:57 +0200 Subject: [PATCH] Fix bug when moving directories to trash * lisp/files.el (move-file-to-trash): Pass the correct dir-flag to make-temp-file so that a directory is created when a directory is being trashed (Bug#47960). --- lisp/files.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/files.el b/lisp/files.el index 4fdafe19db9..62e1702fdf9 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -7945,6 +7945,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions, ;; Make a .trashinfo file. Use O_EXCL, as per trash-spec 1.0. (let* ((files-base (file-name-nondirectory fn)) + (is-directory (file-directory-p fn)) (overwrite nil) info-fn) ;; We're checking further down whether the info file @@ -7956,7 +7957,8 @@ Otherwise, trash FILENAME using the freedesktop.org conventions, files-base (file-name-nondirectory (make-temp-file (expand-file-name - files-base trash-files-dir))))) + files-base trash-files-dir) + is-directory)))) (setq info-fn (expand-file-name (concat files-base ".trashinfo") trash-info-dir)) -- 2.39.5