mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

End predicate `dired-in-this-tree' with '-p'

Browse source 
* lisp/dired.el(dired-in-this-tree-p): Rename from `dired-in-this-tree'.
Add docstring.

(dired-in-this-tree): Define an alias to `dired-in-this-tree-p'.

(dired-buffers-for-dir)
* lisp/dired-aux.el (dired-tree-down, dired-kill-tree)
(dired-insert-subdir, dired-rename-subdir): Update all callers (bug#32892).
This commit is contained in:
Tino Calancha 2019-07-13 04:03:50 +02:00 • committed by Lars Ingebrigtsen
parent 936d074d7c
commit 4b73c0cde6
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/dired-aux.el
View file

@ -1646,7 +1646,7 @@ If `ask', ask for user confirmation."
(while blist
(with-current-buffer (car blist)
(if (and buffer-file-name
(dired-in-this-tree buffer-file-name expanded-from-dir))
(dired-in-this-tree-p buffer-file-name expanded-from-dir))
(let ((modflag (buffer-modified-p))
(to-file (dired-replace-in-string
(concat "^" (regexp-quote from-dir))
@ -1665,7 +1665,7 @@ If `ask', ask for user confirmation."
(while alist
(setq elt (car alist)
alist (cdr alist))
(if (dired-in-this-tree (car elt) expanded-dir)
(if (dired-in-this-tree-p (car elt) expanded-dir)
;; ELT's subdir is affected by the rename
(dired-rename-subdir-2 elt dir to)))
(if (equal dir default-directory)
@ -2420,7 +2420,7 @@ This function takes some pains to conform to `ls -lR' output."
(setq switches (dired-replace-in-string "R" "" switches))
(dolist (cur-ass dired-subdir-alist)
(let ((cur-dir (car cur-ass)))
(and (dired-in-this-tree cur-dir dirname)
(and (dired-in-this-tree-p cur-dir dirname)
(let ((cur-cons (assoc-string cur-dir dired-switches-alist)))
(if cur-cons
(setcdr cur-cons switches)
@ -2432,7 +2432,7 @@ This function takes some pains to conform to `ls -lR' output."
(defun dired-insert-subdir-validate (dirname &optional switches)
;; Check that it is valid to insert DIRNAME with SWITCHES.
;; Signal an error if invalid (e.g. user typed `i' on `..').
(or (dired-in-this-tree dirname (expand-file-name default-directory))
(or (dired-in-this-tree-p dirname (expand-file-name default-directory))
(error "%s: not in this directory tree" dirname))
(let ((real-switches (or switches dired-subdir-switches)))
(when real-switches
@ -2473,7 +2473,7 @@ of marked files. If KILL-ROOT is non-nil, kill DIRNAME as well."
(setq dir (car (car s-alist))
s-alist (cdr s-alist))
(and (or kill-root (not (string-equal dir dirname)))
(dired-in-this-tree dir dirname)
(dired-in-this-tree-p dir dirname)
(dired-goto-subdir dir)
(setq m-alist (nconc (dired-kill-subdir remember-marks) m-alist))))
m-alist))
@ -2711,7 +2711,7 @@ Lower levels are unaffected."
(while rest
(setq elt (car rest)
rest (cdr rest))
(if (dired-in-this-tree (directory-file-name (car elt)) dir)
(if (dired-in-this-tree-p (directory-file-name (car elt)) dir)
(setq rest nil
pos (dired-goto-subdir (car elt))))))
(if pos

6
lisp/dired.el
View file

@ -2697,7 +2697,7 @@ You can then feed the file name(s) to other commands with \\[yank]."
((null (buffer-name buf))
;; Buffer is killed - clean up:
(setq dired-buffers (delq elt dired-buffers)))
((dired-in-this-tree dir (car elt))
((dired-in-this-tree-p dir (car elt))
(with-current-buffer buf
(and (assoc dir dired-subdir-alist)
(or (null file)
@ -2770,10 +2770,12 @@ You can then feed the file name(s) to other commands with \\[yank]."
;;; utility functions
(defun dired-in-this-tree (file dir)
(defun dired-in-this-tree-p (file dir)
;;"Is FILE part of the directory tree starting at DIR?"
(let (case-fold-search)
(string-match-p (concat "^" (regexp-quote dir)) file)))
(define-obsolete-function-alias 'dired-in-this-tree
'dired-in-this-tree-p "27.1")
(defun dired-normalize-subdir (dir)
;; Prepend default-directory to DIR if relative file name.