From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 30 Oct 2020 15:07:21 +0000 (+0100)
Subject: Fix copying symbolic links in eshell
X-Git-Tag: emacs-28.0.90~5335
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5611bfc4216da1a4515284b6ed47acab8026696;p=emacs.git

Fix copying symbolic links in eshell

* lisp/eshell/em-unix.el (eshell-shuffle-files): Don't bug out
when copying symbolic links (bug#38577).
---

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index fd4cd6716d2..68aa6803278 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -439,7 +439,10 @@ Remove the DIRECTORY(ies), if they are empty.")
 		       (setq link (file-symlink-p source)))
 		  (progn
 		    (apply 'eshell-funcalln 'make-symbolic-link
-			   link target args)
+			   link target
+                           ;; `make-symbolic-link' doesn't have
+                           ;; KEEP-TIME; just OK-IF-ALREADY-EXISTS.
+                           (list (car args)))
 		    (if (eq func 'rename-file)
 			(if (and (file-directory-p source)
 				 (not (file-symlink-p source)))