[Emacs-diffs] Changes to emacs/lisp/net/ange-ftp.el

[Kai Großjohann]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.48 emacs/lisp/net/ange-ftp.el:1.49
*** emacs/lisp/net/ange-ftp.el:1.48     Sat Feb 15 10:41:33 2003
--- emacs/lisp/net/ange-ftp.el  Sun Apr 13 08:46:10 2003
***************
*** 3356,3364 ****
        (ange-ftp-real-insert-file-contents filename visit beg end replace))))
  
  (defun ange-ftp-expand-symlink (file dir)
!   (if (file-name-absolute-p file)
!       (ange-ftp-replace-name-component dir file)
!     (expand-file-name file dir)))
  
  (defun ange-ftp-file-symlink-p (file)
    ;; call ange-ftp-expand-file-name rather than the normal
--- 3356,3369 ----
        (ange-ftp-real-insert-file-contents filename visit beg end replace))))
  
  (defun ange-ftp-expand-symlink (file dir)
!   (let ((res (if (file-name-absolute-p file)
!                (ange-ftp-replace-name-component dir file)
!              (expand-file-name file dir))))
!     (if (file-symlink-p res)
!       (ange-ftp-expand-symlink
!        (ange-ftp-get-file-entry res)
!        (file-name-directory (directory-file-name res)))
!       res)))
  
  (defun ange-ftp-file-symlink-p (file)
    ;; call ange-ftp-expand-file-name rather than the normal
***************
*** 3370,3380 ****
             (gethash
              (ange-ftp-get-file-part file)
              (ange-ftp-get-files (file-name-directory file)))))
!       (if (stringp file-ent)
!           (if (file-name-absolute-p file-ent)
!               (ange-ftp-replace-name-component
!                (file-name-directory file) file-ent)
!             file-ent)))
      (ange-ftp-real-file-symlink-p file)))
  
  (defun ange-ftp-file-exists-p (name)
--- 3375,3381 ----
             (gethash
              (ange-ftp-get-file-part file)
              (ange-ftp-get-files (file-name-directory file)))))
!       (and (stringp file-ent) file-ent))
      (ange-ftp-real-file-symlink-p file)))
  
  (defun ange-ftp-file-exists-p (name)