Mercurial > emacs
changeset 107076:59d8f3cc91f4
* 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)
| author | Michael Albinus <albinus@detlef> |
|---|---|
| date | Wed, 03 Feb 2010 07:16:34 +0100 |
| parents | 389adef9b27d |
| children | 25a0d9b486ba 3a905f16bc97 |
| files | lisp/ChangeLog lisp/net/ange-ftp.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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.
--- 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