From: Gerd Moellmann <gerd@gnu.org>
Date: Sun, 30 Jul 2000 11:49:11 +0000 (+0000)
Subject: (dired-build-subdir-alist): Expand subdirectory names
X-Git-Tag: emacs-pretest-21.0.90~2551
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4c017767fe919e58f655729d8609749fede4d8a;p=emacs.git

(dired-build-subdir-alist): Expand subdirectory names
correctly in recursive ange-ftp listings.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index e7dedadd7e1..393635452a1 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1764,7 +1764,13 @@ Returns the new value of the alist."
   (save-excursion
     (let ((count 0)
 	  (buffer-read-only nil)
-	  new-dir-name)
+	  new-dir-name
+	  (R-ftp-base-dir-regex
+	   ;; Used to expand subdirectory names correctly in recursive
+	   ;; ange-ftp listings.
+	   (and (string-match "R" dired-actual-switches)
+		(string-match "\\`/.*:\\(/.*\\)" default-directory)
+		(concat "\\`" (match-string 1 default-directory)))))
       (goto-char (point-min))
       (setq dired-subdir-alist nil)
       (while (and (re-search-forward dired-subdir-regexp nil t)
@@ -1778,7 +1784,15 @@ Returns the new value of the alist."
 	(save-excursion
 	  (goto-char (match-beginning 1))
 	  (setq new-dir-name
-		(expand-file-name (buffer-substring (point) (match-end 1))))
+		(buffer-substring-no-properties (point) (match-end 1))
+		new-dir-name
+		(save-match-data
+		  (if (and R-ftp-base-dir-regex
+			   (not (string= new-dir-name default-directory))
+			   (string-match R-ftp-base-dir-regex new-dir-name))
+		      (concat default-directory
+			      (substring new-dir-name (match-end 0)))
+		    (expand-file-name new-dir-name))))
 	  (delete-region (point) (match-end 1))
 	  (insert new-dir-name))
 	(setq count (1+ count))