# HG changeset patch # User Michael Albinus # Date 1265177794 -3600 # Node ID 59d8f3cc91f4eea31ada2772495bfedbae86e56a # Parent 389adef9b27d8275acc74a97560545639bcfd494 * 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 -r 389adef9b27d -r 59d8f3cc91f4 lisp/ChangeLog --- a/lisp/ChangeLog Tue Feb 02 22:55:03 2010 -0500 +++ b/lisp/ChangeLog Wed Feb 03 07:16:34 2010 +0100 @@ -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 -r 389adef9b27d -r 59d8f3cc91f4 lisp/net/ange-ftp.el --- a/lisp/net/ange-ftp.el Tue Feb 02 22:55:03 2010 -0500 +++ b/lisp/net/ange-ftp.el Wed Feb 03 07:16:34 2010 +0100 @@ -4534,7 +4534,7 @@ ;; 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