[Emacs-diffs] /srv/bzr/emacs/trunk r99438: * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory

[Michael Albinus]

------------------------------------------------------------
revno: 99438
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-03 07:16:34 +0100
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-03 03:55:03 +0000
+++ b/lisp/ChangeLog    2010-02-03 06:16:34 +0000
@@ -1,3 +1,10 @@
+2010-02-03  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc-hooks.el (vc-path): Make it an obsolete var, rather than function.

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2010-02-02 11:19:36 +0000
+++ b/lisp/net/ange-ftp.el      2010-02-03 06:16:34 +0000
@@ -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