Mercurial > emacs
changeset 39376:7e0db9f5d524
(dired-build-subdir-alist): Accept optional arg SWITCHES.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 21 Sep 2001 16:41:58 +0000 |
| parents | 7eccdd28d65e |
| children | d4019f065e01 |
| files | lisp/dired.el |
| diffstat | 1 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dired.el Fri Sep 21 14:09:22 2001 +0000 +++ b/lisp/dired.el Fri Sep 21 16:41:58 2001 +0000 @@ -1788,21 +1788,24 @@ nil ; return nil if not found (error "%s directory" (if (> arg 0) "Last" "First")))))) -(defun dired-build-subdir-alist () +(defun dired-build-subdir-alist (&optional switches) "Build `dired-subdir-alist' by parsing the buffer. -Returns the new value of the alist." +Returns the new value of the alist. +If optional arg SWITCHES is non-nil, use its value +instead of `dired-actual-switches'." (interactive) (dired-clear-alist) (save-excursion - (let ((count 0) - (buffer-read-only nil) - 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))))) + (let* ((count 0) + (buffer-read-only nil) + (switches (or switches dired-actual-switches)) + new-dir-name + (R-ftp-base-dir-regex + ;; Used to expand subdirectory names correctly in recursive + ;; ange-ftp listings. + (and (string-match "R" 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)