diff options
| author | Mike Kupfer <mkupfer@alum.berkeley.edu> | 2022-11-20 16:44:20 -0800 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-11-24 13:17:08 +0200 |
| commit | 867e962cf5318399dfc17cc53c661db4bbd3c3d1 (patch) | |
| tree | 7b7918d0f3a6300ae92d8b582921d2c7ecdab574 /lisp/files.el | |
| parent | 95d827f21ef7bc3ed91335a6418e17fbb4ed5c63 (diff) | |
| download | emacs-867e962cf5318399dfc17cc53c661db4bbd3c3d1.tar.gz emacs-867e962cf5318399dfc17cc53c661db4bbd3c3d1.tar.bz2 emacs-867e962cf5318399dfc17cc53c661db4bbd3c3d1.zip | |
Fix trashing of symlink that points at a directory
* lisp/files.el (move-file-to-trash): Redefine is-directory so
that it is false for symlinks.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el index 127cf77240f..60c0eb917e5 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -8566,7 +8566,8 @@ 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)) + (is-directory (and (file-directory-p fn) + (not (file-symlink-p fn)))) (overwrite nil) info-fn) ;; We're checking further down whether the info file |