Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.69 emacs/lisp/net/ange-ftp.el:1.70
*** emacs/lisp/net/ange-ftp.el:1.69 Mon Aug 1 15:17:06 2005
--- emacs/lisp/net/ange-ftp.el Tue Aug 9 21:00:39 2005
***************
*** 2328,2335 ****
;; We cd and then use `ls' with no directory argument.
;; This works around a misfeature of some versions of netbsd ftpd.
(unless (equal cmd1 ".")
! (setq result (ange-ftp-cd host user (nth 1 cmd) 'noerror)))
! (setq cmd1 cmd3)))
;; First argument is the remote name
((progn
--- 2328,2340 ----
;; We cd and then use `ls' with no directory argument.
;; This works around a misfeature of some versions of netbsd ftpd.
(unless (equal cmd1 ".")
! (setq result (ange-ftp-cd host user
! ;; Make sure the target to which
! ;; `cd' is performed is a directory.
! (file-name-directory (nth 1 cmd))
! 'noerror)))
! ;; Concatenate the switches and the target to be used with `ls'.
! (setq cmd1 (concat "\"" cmd3 " " cmd1 "\""))))
;; First argument is the remote name
((progn
***************
*** 3122,3129 ****
(rest (substring name (match-end 0)))
(dir (ange-ftp-expand-dir host user tilda)))
(if dir
! (setq name (if (string-equal dir "/")
! rest (concat dir rest)))
(error "User \"%s\" is not known"
(substring tilda 1)))))
--- 3127,3138 ----
(rest (substring name (match-end 0)))
(dir (ange-ftp-expand-dir host user tilda)))
(if dir
! (setq name (cond ((string-equal rest "")
! dir)
! ((string-equal dir "/")
! rest)
! (t
! (concat dir rest))))
(error "User \"%s\" is not known"
(substring tilda 1)))))
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
