(dired-build-subdir-alist): Avoid mistaking a file name

ending in a colon for a subdir header line.

diff --git a/lisp/dired.el b/lisp/dired.el
index 8d7c76ab08c002ff9d488a4269223253c17feadb..286e7d10dbdf1a3de529557654f7b78d3309d733 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -185,6 +185,7 @@ directory name and the cdr is the actual files to list.")
               "-[-r][-w].[-r][-w][xs][-r][-w]."
               "-[-r][-w].[-r][-w].[-r][-w][xst]")
             "\\|"))
+(defvar dired-re-perms "-[-r][-w].[-r][-w].[-r][-w].")
 (defvar dired-re-dot "^.* \\.\\.?$")
 
 (defvar dired-subdir-alist nil
@@ -1360,7 +1361,14 @@ Returns the new value of the alist."
          new-dir-name)
       (goto-char (point-min))
       (setq dired-subdir-alist nil)
-      (while (re-search-forward dired-subdir-regexp nil t)
+      (while (and (re-search-forward dired-subdir-regexp nil t)
+                 ;; Avoid taking a file name ending in a colon
+                 ;; as a subdir name.
+                 (not (save-excursion
+                        (goto-char (match-beginning 0))
+                        (beginning-of-line)
+                        (forward-char 2)
+                        (looking-at dired-re-perms))))
        (save-excursion
          (goto-char (match-beginning 1))
          (setq new-dir-name