From: Eli Zaretskii <eliz@gnu.org>
To: Jean Louis <bugs@gnu.support>
Cc: michael_heerdegen@web.de, 59986@debbugs.gnu.org
Subject: bug#59986: 30.0.50; Can't trash file with broken symbolic link
Date: Thu, 15 Dec 2022 18:07:45 +0200 [thread overview]
Message-ID: <83y1r8k5v2.fsf@gnu.org> (raw)
In-Reply-To: <Y5s1KMHPYXU/FW4l@protected.localdomain> (message from Jean Louis on Thu, 15 Dec 2022 17:54:32 +0300)
> Date: Thu, 15 Dec 2022 17:54:32 +0300
> From: Jean Louis <bugs@gnu.support>
> Cc: Michael Heerdegen <michael_heerdegen@web.de>, bugs@gnu.support,
> 59986@debbugs.gnu.org
>
> If there is dangling symlink in Trash then even if the file to be
> deleted to Trash exists and is not symlink, I get the same error
> message:
Can you try the patch below and see if it solves the problem?
diff --git a/lisp/files.el b/lisp/files.el
index d785d4f..c74e7e8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8467,6 +8467,14 @@ trash--hexify-table
(declare-function system-move-file-to-trash "w32fns.c" (filename))
+(defun file-exists-in-trash-p (filename)
+ "Return non-nil if FILENAME exists in the trash.
+
+This is like `file-exists-p', but it also returns non-nil
+if FILENAME is a dangling symlink, to allow trashing such files."
+ (or (file-exists-p filename)
+ (file-symlink-p filename)))
+
(defun move-file-to-trash (filename)
"Move the file (or directory) named FILENAME to the trash.
When `delete-by-moving-to-trash' is non-nil, this function is
@@ -8497,7 +8505,7 @@ move-file-to-trash
(unless (file-directory-p trash-dir)
(make-directory trash-dir t))
;; Ensure that the trashed file-name is unique.
- (if (file-exists-p new-fn)
+ (if (file-exists-in-trash-p new-fn)
(let ((version-control t)
(backup-directory-alist nil))
(setq new-fn (car (find-backup-file-name new-fn)))))
@@ -8574,7 +8582,7 @@ move-file-to-trash
;; We're checking further down whether the info file
;; exists, but the file name may exist in the trash
;; directory even if there is no info file for it.
- (when (file-exists-p
+ (when (file-exists-in-trash-p
(file-name-concat trash-files-dir files-base))
(setq overwrite t
files-base (file-name-nondirectory
@@ -8612,7 +8620,7 @@ move-file-to-trash
(let ((delete-by-moving-to-trash nil)
(new-fn (file-name-concat trash-files-dir files-base)))
(if (or (not is-directory)
- (not (file-exists-p new-fn)))
+ (not (file-exists-in-trash-p new-fn)))
(rename-file fn new-fn overwrite)
(copy-directory fn
(file-name-as-directory new-fn)
next prev parent reply other threads:[~2022-12-15 16:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-12 6:51 bug#59986: 30.0.50; Can't trash file with broken symbolic link Jean Louis
2022-12-13 3:51 ` Michael Heerdegen
2022-12-13 8:00 ` Jean Louis
2022-12-13 12:42 ` Eli Zaretskii
2022-12-13 13:49 ` Jean Louis
2022-12-13 14:44 ` Eli Zaretskii
2022-12-13 19:24 ` Jean Louis
2022-12-14 12:29 ` Eli Zaretskii
2022-12-15 0:13 ` Michael Heerdegen
2022-12-15 7:12 ` Eli Zaretskii
2022-12-15 14:54 ` Jean Louis
2022-12-15 16:07 ` Eli Zaretskii [this message]
2022-12-16 6:39 ` Jean Louis
2022-12-16 15:56 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83y1r8k5v2.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=59986@debbugs.gnu.org \
--cc=bugs@gnu.support \
--cc=michael_heerdegen@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).