diff options
| -rw-r--r-- | lisp/dired.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 8d7c76ab08c..286e7d10dbd 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -185,6 +185,7 @@ directory name and the cdr is the actual files to list.") | |||
| 185 | "-[-r][-w].[-r][-w][xs][-r][-w]." | 185 | "-[-r][-w].[-r][-w][xs][-r][-w]." |
| 186 | "-[-r][-w].[-r][-w].[-r][-w][xst]") | 186 | "-[-r][-w].[-r][-w].[-r][-w][xst]") |
| 187 | "\\|")) | 187 | "\\|")) |
| 188 | (defvar dired-re-perms "-[-r][-w].[-r][-w].[-r][-w].") | ||
| 188 | (defvar dired-re-dot "^.* \\.\\.?$") | 189 | (defvar dired-re-dot "^.* \\.\\.?$") |
| 189 | 190 | ||
| 190 | (defvar dired-subdir-alist nil | 191 | (defvar dired-subdir-alist nil |
| @@ -1360,7 +1361,14 @@ Returns the new value of the alist." | |||
| 1360 | new-dir-name) | 1361 | new-dir-name) |
| 1361 | (goto-char (point-min)) | 1362 | (goto-char (point-min)) |
| 1362 | (setq dired-subdir-alist nil) | 1363 | (setq dired-subdir-alist nil) |
| 1363 | (while (re-search-forward dired-subdir-regexp nil t) | 1364 | (while (and (re-search-forward dired-subdir-regexp nil t) |
| 1365 | ;; Avoid taking a file name ending in a colon | ||
| 1366 | ;; as a subdir name. | ||
| 1367 | (not (save-excursion | ||
| 1368 | (goto-char (match-beginning 0)) | ||
| 1369 | (beginning-of-line) | ||
| 1370 | (forward-char 2) | ||
| 1371 | (looking-at dired-re-perms)))) | ||
| 1364 | (save-excursion | 1372 | (save-excursion |
| 1365 | (goto-char (match-beginning 1)) | 1373 | (goto-char (match-beginning 1)) |
| 1366 | (setq new-dir-name | 1374 | (setq new-dir-name |