mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-29 19:48:19 +00:00
(dired-build-subdir-alist): Accept optional arg SWITCHES.
This commit is contained in:
parent
59957f85f4
commit
3c13627aed
@ -1788,21 +1788,24 @@ regardless of the language.")
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user