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.

diff --git a/lisp/files.el b/lisp/files.el
index 127cf77240f56f935f70468f6ebd926afd9cc33a..60c0eb917e55ac33292877e41143f96cfc973dd0 100644 (file)
--- 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