(ange-ftp-insert-directory): Fix handling of symlinks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 048d5a324b02011cef7c0e025f8b74b783c9c1e3..5fe232a05b20c0a872686e2d0d95ceea6ed40e0a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-12  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * net/ange-ftp.el (ange-ftp-insert-directory):
+       Fix handling of symlinks.
+
 2003-04-12  Morten Welinder  <terra@gnu.org>
 
        * add-log.el (add-change-log-entry): Get add-log-full-name and
@@ -25,8 +30,8 @@
 
 2003-03-04  Rob Kaut  <rob@siworks.com>  (tiny change)
 
-       * progmodes/vhdl-mode.el (vhdl-comment-uncomment-region): Remove
-       two comment characters at start of line instead of one.
+       * progmodes/vhdl-mode.el (vhdl-comment-uncomment-region):
+       Remove two comment characters at start of line instead of one.
 
 2003-03-03  Kenichi Handa  <handa@m17n.org>
 
@@ -101,7 +106,7 @@
 
 2003-01-23  Masatake YAMATO  <jet@gyve.org>
 
-       * progmodes/asm-mode.el (asm-mode): Added syntax table entries for
+       * progmodes/asm-mode.el (asm-mode): Add syntax table entries for
        /* */ comments.
 
 2003-01-22  Juanma Barranquero  <lektu@terra.es>
@@ -125,13 +130,13 @@
        * vc-rcs.el (vc-rcs-checkout): Handle t argument for REV.
        (vc-rcs-checkin): By default, specify the current workfile
        branch as the check-in revision.
-        (vc-rcs-revert): Unlock only if the user does have the lock.
+       (vc-rcs-revert): Unlock only if the user does have the lock.
 
        * vc-cvs.el (vc-cvs-checkout): Handle t argument for REV.
 
        * vc-sccs.el (vc-sccs-checkout): Likewise.
 
-        * log-view.el (log-view-message-re): The rev might be locked.
+       * log-view.el (log-view-message-re): The rev might be locked.
 
 2002-12-18  Gustav H\e,Ae\e(Bllberg  <gustav@virtutech.se>  (tiny change)
 

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 9f65961916ce04c0c50649d7c892a1609a848486..e97bc23c4030090194d8f0d644558e30db6e5b83 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4340,9 +4340,11 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
          tem)
       (if parsed
          (if (and (not wildcard)
-                  (setq tem (file-symlink-p (directory-file-name file))))
+                  (stringp (setq tem (ange-ftp-get-file-entry
+                                      (directory-file-name file)))))
              (ange-ftp-insert-directory
-              (ange-ftp-replace-name-component file tem)
+              (ange-ftp-expand-symlink
+               tem (file-name-directory (directory-file-name file)))
               switches wildcard full)
            (insert
             (if wildcard