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

[Stefan Monnier]

Index: emacs/lisp/net/ange-ftp.el
diff -c emacs/lisp/net/ange-ftp.el:1.32 emacs/lisp/net/ange-ftp.el:1.33
*** emacs/lisp/net/ange-ftp.el:1.32     Sun May 12 16:35:41 2002
--- emacs/lisp/net/ange-ftp.el  Mon May 20 14:51:49 2002
***************
*** 1459,1471 ****
          (if (string-match "^[^/]*\\(/\\).*$" key)
              (let ((host (substring key 0 (match-beginning 1)))
                    (user (substring key (match-end 1))))
!               (setq res (cons (list (concat user "@" host ":"))
!                               res))))))
         ange-ftp-passwd-hashtable)
        (ange-ftp-map-hashtable
         (function (lambda (host user)
!                  (setq res (cons (list (concat host ":"))
!                                  res))))
         ange-ftp-user-hashtable)
        (or res (list nil)))))
  
--- 1459,1469 ----
          (if (string-match "^[^/]*\\(/\\).*$" key)
              (let ((host (substring key 0 (match-beginning 1)))
                    (user (substring key (match-end 1))))
!               (push (concat user "@" host ":") res)))))
         ange-ftp-passwd-hashtable)
        (ange-ftp-map-hashtable
         (function (lambda (host user)
!                  (push (concat host ":") res)))
         ange-ftp-user-hashtable)
        (or res (list nil)))))
  
***************
*** 2357,2365 ****
        (setq cmd1 "."))
  
        ;; If the remote ls can take switches, put them in
!       (or (memq host-type ange-ftp-dumb-host-types)
!         (setq cmd0 'ls
!               cmd1 (format "\"%s %s\"" cmd3 cmd1))))
  
       ;; First argument is the remote name
       ((progn
--- 2355,2367 ----
        (setq cmd1 "."))
  
        ;; If the remote ls can take switches, put them in
!       (unless (memq host-type ange-ftp-dumb-host-types)
!       (setq cmd0 'ls)
!       ;; 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
***************
*** 4077,4085 ****
          (try-completion
           file
           (nconc (ange-ftp-generate-root-prefixes)
!                 (mapcar 'list
!                         (ange-ftp-real-file-name-all-completions
!                          file ange-ftp-this-dir))))
        (ange-ftp-real-file-name-completion file ange-ftp-this-dir)))))
  
  
--- 4079,4086 ----
          (try-completion
           file
           (nconc (ange-ftp-generate-root-prefixes)
!                 (ange-ftp-real-file-name-all-completions
!                  file ange-ftp-this-dir)))
        (ange-ftp-real-file-name-completion file ange-ftp-this-dir)))))