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).

diff --git a/lisp/files.el b/lisp/files.el
index 4fdafe19db9d28715b65457ac72d7ea1607773bf..62e1702fdf9f7d4cfd6e07f8a6a4ead794bc2823 100644 (file)
--- 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))