From 8214b6e4e7e65e08bb055daf7d0a681155cb37c2 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 3 Feb 2010 07:16:34 +0100 Subject: [PATCH] * 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) --- lisp/ChangeLog | 7 +++++++ lisp/net/ange-ftp.el | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 864a91e0e51..3e133665570 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-02-03 Michael Albinus + + * 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 * 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 d443532ce2a..127fba3d7fb 100644 --- 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 -- 2.39.2