* net/ange-ftp.el (ange-ftp-insert-directory): Parse directory

also in case of (and (not full) (not wildcard)). This is needed,
when dired is called with a list of files, which are not in
`default-directory'.  (Bug#5478)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 864a91e0e51942dc0d4b58817c63372e105aaec9..3e133665570abc4206bc053989119a271d98046f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory
+       also in case of (and (not full) (not wildcard)). This is needed,
+       when dired is called with a list of files, which are not in
+       `default-directory'.  (Bug#5478)
+
 2010-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc-hooks.el (vc-path): Make it an obsolete var, rather than function.

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index d443532ce2a220701acf6cf2afd19aaeec02b858..127fba3d7fbccabbbb09e793e54d6e5bb6cf9119 100644 (file)
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4534,7 +4534,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
          ;; Remove "d" which dired added to `switches'.
          (setq switches (substring switches 0 (match-beginning 0))))
        (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".")
-                                    switches nil))
+                                    switches 'parse))
               (filename (file-name-nondirectory (directory-file-name file)))
               (case-fold-search nil))
          ;; FIXME: This presumes a particular output format, which is