emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 4fa75771d17: ; * lisp/files.el (delete-file): Add expand-file-nam


From: Eli Zaretskii
Subject: master 4fa75771d17: ; * lisp/files.el (delete-file): Add expand-file-name back.
Date: Fri, 11 Aug 2023 08:04:44 -0400 (EDT)

branch: master
commit 4fa75771d17800651cab6f1e97bc7fbb1f3e874b
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; * lisp/files.el (delete-file): Add expand-file-name back.
---
 lisp/files.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/files.el b/lisp/files.el
index 685eb5fc957..69c4a33cdeb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -6374,7 +6374,8 @@ With a prefix argument, TRASH is nil."
                      (null current-prefix-arg)))
   (if (and (file-directory-p filename) (not (file-symlink-p filename)))
       (signal 'file-error (list "Removing old name: is a directory" filename)))
-  (let* ((handler (find-file-name-handler filename 'delete-file)))
+  (let* ((filename (expand-file-name filename))
+         (handler (find-file-name-handler filename 'delete-file)))
     (cond (handler (funcall handler 'delete-file filename trash))
           ((and delete-by-moving-to-trash trash) (move-file-to-trash filename))
           (t (delete-file-internal filename)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]