bug#58721: 28.2; dired with delete-by-moving-to-trash can't trash directory twice

[Mike Kupfer]

Mike Kupfer wrote:

> * copy-directory("/tmp/emacs-git" 
> "/home/kupfer/.local/share/Trash/files/emacs-gitH0l..." t nil)
>   rename-file("/tmp/emacs-git" 
> "/home/kupfer/.local/share/Trash/files/emacs-gitH0l..." t)
>   move-file-to-trash("/tmp/emacs-git")
>   delete-directory("/tmp/emacs-git" always t)
>   dired-delete-file("/tmp/emacs-git" top t)
>   dired-internal-do-deletions((("/tmp/emacs-git" . #<marker at 233 in 
> tmp<>>)) nil t)
>   dired-do-flagged-delete()
>   funcall-interactively(dired-do-flagged-delete)
>   call-interactively(dired-do-flagged-delete nil nil)
>   command-execute(dired-do-flagged-delete)
[...]
> Hrm.  Shouldn't the call to copy-directory look like
> 
>   copy-directory("/tmp/emacs-git" 
> "/home/kupfer/.local/share/Trash/files/emacs-gitH0l..." t nil t)
>                ^^^

I played with this some more this morning, this time on Emacs 29.  It
looks like rename-file should have called copy-directory as

copy-directory("/tmp/emacs-git"
  "/home/kupfer/.local/share/Trash/files/emacs-gitH0lx1e/" t nil t)

That is, 2 changes from current behavior are needed: append a "/" to the
target name, and specify copy-contents as t.

The test case that I used to emulate the current behavior is

1. mkdir a; touch a/b

2. mkdir /tmp/newa
(This assumes that /tmp is a different filesystem than the filesystem
where "a" was created.)

3. M-: (copy-directory "a" "/tmp/newa" t nil) RET

That gives the already-exists error.

With (copy-directory "a" "/tmp/newa/" t nil), I get /tmp/newa/a/b, which
isn't what's wanted for the Trash directory.

With (copy-directory "a" "/tmp/newa/" t nil t), I get /tmp/newa/b, which
is what's desired.

mike