mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Backport dired-check-switches from trunk.

Browse source 
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. 
(dired-switches-escape-p, dired-move-to-end-of-filename):
Use `dired-check-switches'.
(dired-insert-old-subdirs, dired-build-subdir-alist)
(dired-sort-R-check): Use `dired-switches-recursive-p'.

Fixes: debbugs:17218
This commit is contained in:
Juri Linkov 2014-05-08 22:22:43 +03:00
parent a9fd3545bb
commit c055a50b4a
2 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/ChangeLog
View file

@ -1,3 +1,12 @@
2014-05-08 Juri Linkov <juri@jurta.org>
* dired.el (dired-check-switches, dired-switches-recursive-p):
New functions. (Bug#17218)
(dired-switches-escape-p, dired-move-to-end-of-filename):
Use `dired-check-switches'.
(dired-insert-old-subdirs, dired-build-subdir-alist)
(dired-sort-R-check): Use `dired-switches-recursive-p'.
2014-05-08 Glenn Morris <rgm@gnu.org>
* net/browse-url.el (browse-url-mosaic):

31
lisp/dired.el
View file

@ -1142,10 +1142,22 @@ BEG..END is the line where the file info is located."
(defvar ls-lisp-use-insert-directory-program)
(defun dired-check-switches (switches short &optional long)
"Return non-nil if the string SWITCHES matches LONG or SHORT format."
(let (case-fold-search)
(and (stringp switches)
(string-match-p (concat "\\(\\`\\| \\)-[[:alnum:]]*" short
(if long (concat "\\|--" long "\\>") ""))
switches))))
(defun dired-switches-escape-p (switches)
"Return non-nil if the string SWITCHES contains -b or --escape."
;; Do not match things like "--block-size" that happen to contain "b".
(string-match-p "\\(\\`\\| \\)-[[:alnum:]]*b\\|--escape\\>" switches))
(dired-check-switches switches "b" "escape"))
(defun dired-switches-recursive-p (switches)
"Return non-nil if the string SWITCHES contains -R or --recursive."
(dired-check-switches switches "R" "recursive"))
(defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
"Insert a directory listing of DIR, Dired style.
@ -1402,7 +1414,7 @@ Each element of ALIST looks like (FILE . MARKERCHAR)."
(defun dired-insert-old-subdirs (old-subdir-alist)
"Try to insert all subdirs that were displayed before.
Do so according to the former subdir alist OLD-SUBDIR-ALIST."
(or (string-match-p "R" dired-actual-switches)
(or (dired-switches-recursive-p dired-actual-switches)
(let (elt dir)
(while old-subdir-alist
(setq elt (car old-subdir-alist)
@ -2349,9 +2361,8 @@ Return the position of the beginning of the filename, or nil if none found."
;; This is the UNIX version.
(if (get-text-property (point) 'dired-filename)
(goto-char (next-single-property-change (point) 'dired-filename))
(let (opoint file-type executable symlink hidden case-fold-search used-F eol)
;; case-fold-search is nil now, so we can test for capital F:
(setq used-F (string-match-p "F" dired-actual-switches)
(let (opoint file-type executable symlink hidden used-F eol)
(setq used-F (dired-check-switches dired-actual-switches "F" "classify")
opoint (point)
eol (line-end-position)
hidden (and selective-display
@ -2613,7 +2624,7 @@ instead of `dired-actual-switches'."
(R-ftp-base-dir-regex
;; Used to expand subdirectory names correctly in recursive
;; ange-ftp listings.
(and (string-match-p "R" switches)
(and (dired-switches-recursive-p switches)
(string-match "\\`/.*:\\(/.*\\)" default-directory)
(concat "\\`" (match-string 1 default-directory)))))
(goto-char (point-min))
@ -3688,12 +3699,12 @@ Saves `dired-subdir-alist' when R is set and restores saved value
minus any directories explicitly deleted when R is cleared.
To be called first in body of `dired-sort-other', etc."
(cond
((and (string-match-p "R" switches)
(not (string-match-p "R" dired-actual-switches)))
((and (dired-switches-recursive-p switches)
(not (dired-switches-recursive-p dired-actual-switches)))
;; Adding -R to ls switches -- save `dired-subdir-alist':
(setq dired-subdir-alist-pre-R dired-subdir-alist))
((and (string-match-p "R" dired-actual-switches)
(not (string-match-p "R" switches)))
((and (dired-switches-recursive-p dired-actual-switches)
(not (dired-switches-recursive-p switches)))
;; Deleting -R from ls switches -- revert to pre-R subdirs
;; that are still present:
(setq dired-subdir-alist