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

[Michael Albinus]

------------------------------------------------------------
revno: 99454
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-05 12:15:28 +0100
message:
  * net/ange-ftp.el (ange-ftp-insert-directory):
  * net/tramp-imap.el (tramp-imap-handle-insert-directory):
  * net/tramp-smb.el (tramp-smb-handle-insert-directory):
  Handle also directories.  (Bug#5478)
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el
  lisp/net/tramp-imap.el
  lisp/net/tramp-smb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-05 08:12:08 +0000
+++ b/lisp/ChangeLog    2010-02-05 11:15:28 +0000
@@ -1,3 +1,10 @@
+2010-02-05  Michael Albinus  <address@hidden>
+
+       * net/ange-ftp.el (ange-ftp-insert-directory):
+       * net/tramp-imap.el (tramp-imap-handle-insert-directory):
+       * net/tramp-smb.el (tramp-smb-handle-insert-directory):
+       Handle also directories.  (Bug#5478)
+
 2010-02-05  Glenn Morris  <address@hidden>
 
        * progmodes/f90.el (f90-font-lock-keywords-2): Fix `enum'.

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2010-02-03 06:16:34 +0000
+++ b/lisp/net/ange-ftp.el      2010-02-05 11:15:28 +0000
@@ -4533,9 +4533,10 @@
        (when (string-match "-?d\\'" switches)
          ;; Remove "d" which dired added to `switches'.
          (setq switches (substring switches 0 (match-beginning 0))))
+       (setq file (directory-file-name file))
        (let* ((dirlist (ange-ftp-ls (or (file-name-directory file) ".")
                                     switches 'parse))
-              (filename (file-name-nondirectory (directory-file-name file)))
+              (filename (file-name-nondirectory file))
               (case-fold-search nil))
          ;; FIXME: This presumes a particular output format, which is
          ;; basically Unix.

=== modified file 'lisp/net/tramp-imap.el'
--- a/lisp/net/tramp-imap.el    2010-02-04 16:25:57 +0000
+++ b/lisp/net/tramp-imap.el    2010-02-05 11:15:28 +0000
@@ -395,9 +395,10 @@
   (filename switches &optional wildcard full-directory-p)
   "Like `insert-directory' for Tramp files."
   (setq filename (expand-file-name filename))
-  (when full-directory-p
-    ;; Called from `dired-add-entry'.
-    (setq filename (file-name-as-directory filename)))
+  (if full-directory-p
+      ;; Called from `dired-add-entry'.
+      (setq filename (file-name-as-directory filename))
+    (setq filename (directory-file-name filename)))
   (with-parsed-tramp-file-name filename nil
     (save-match-data
       (let ((base (file-name-nondirectory localname))
@@ -479,7 +480,8 @@
               (insert
                (format
                 "%s\n"
-                (file-relative-name (expand-file-name (nth 0 x) filename))))
+                (file-relative-name
+                 (expand-file-name (nth 0 x) (file-name-directory filename)))))
               (put-text-property pos (1- (point)) 'dired-filename t))
             (forward-line)
             (beginning-of-line)))

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2010-02-04 16:25:57 +0000
+++ b/lisp/net/tramp-smb.el     2010-02-05 11:15:28 +0000
@@ -651,9 +651,10 @@
   (filename switches &optional wildcard full-directory-p)
   "Like `insert-directory' for Tramp files."
   (setq filename (expand-file-name filename))
-  (when full-directory-p
-    ;; Called from `dired-add-entry'.
-    (setq filename (file-name-as-directory filename)))
+  (if full-directory-p
+      ;; Called from `dired-add-entry'.
+      (setq filename (file-name-as-directory filename))
+    (setq filename (directory-file-name filename)))
   (with-parsed-tramp-file-name filename nil
     (save-match-data
       (let ((base (file-name-nondirectory filename))
@@ -715,8 +716,7 @@
             (let ((attr
                    (when (tramp-smb-get-stat-capability v)
                      (ignore-errors
-                       (file-attributes
-                        (expand-file-name (nth 0 x) filename) 'string)))))
+                       (file-attributes filename 'string)))))
               (insert
                (format
                 "%10s %3d %-8s %-8s %8s %s "
@@ -739,7 +739,9 @@
                 (insert
                  (format
                   "%s\n"
-                  (file-relative-name (expand-file-name (nth 0 x) filename))))
+                  (file-relative-name
+                   (expand-file-name
+                    (nth 0 x) (file-name-directory filename)))))
                 (put-text-property start (1- (point)) 'dired-filename t))
               (forward-line)
               (beginning-of-line))))