(ange-ftp-insert-directory): Explicitly follow symlinks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a543e6491de8d4eacf8ccf4f1e2ac78c0f6d30c..2d5b797cd97f2ab856e748806624f113c01d842d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil.
        This fixes a bug that treated all files as directories.
+       (ange-ftp-insert-directory): Explicitly follow symlinks.
 
        * international/iso-transl.el (iso-transl-char-map) Eliminate the
        alias symbols--put the translated sequences here directly.

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 4700a114f3250db722d21c6481543d9e129895ed..eaf7319f41b913c8308172c2eeae65b98677f535 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4380,13 +4380,19 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
 
 (defun ange-ftp-insert-directory (file switches &optional wildcard full)
   (let ((short (ange-ftp-abbreviate-filename file))
-       (parsed (ange-ftp-ftp-name (expand-file-name file))))
+       (parsed (ange-ftp-ftp-name (expand-file-name file)))
+       tem)
     (if parsed
-       (insert
-        (if wildcard
-            (let ((default-directory (file-name-directory file)))
-              (ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
-          (ange-ftp-ls file switches full)))
+       (if (and (not wildcard)
+                (setq tem (file-symlink-p (directory-file-name file))))
+           (ange-ftp-insert-directory
+            (ange-ftp-replace-name-component file tem)
+            switches wildcard full)
+         (insert
+          (if wildcard
+              (let ((default-directory (file-name-directory file)))
+                (ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
+            (ange-ftp-ls file switches full))))q
       (ange-ftp-real-insert-directory file switches wildcard full))))
 
 (defun ange-ftp-dired-uncache (dir)