[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 f3acc09377: ; Revert "Use file-in-directory-p instead of obsole
From: |
Tassilo Horn |
Subject: |
emacs-28 f3acc09377: ; Revert "Use file-in-directory-p instead of obsolete dired-in-this-tree-p" |
Date: |
Tue, 21 Jun 2022 15:28:43 -0400 (EDT) |
branch: emacs-28
commit f3acc09377f98ae18653eb01c11c57b6449c83af
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>
; Revert "Use file-in-directory-p instead of obsolete dired-in-this-tree-p"
Fixes bug#56126.
This reverts commit b425966b072792b7b22b845b5f2e39ff4f60b5ab.
---
lisp/dired-aux.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index d47bcf0427..b62e94fa77 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1868,7 +1868,7 @@ unless OK-IF-ALREADY-EXISTS is non-nil."
(while blist
(with-current-buffer (car blist)
(if (and buffer-file-name
- (dired-in-this-tree-p buffer-file-name expanded-from-dir))
+ (dired-in-this-tree-p buffer-file-name expanded-from-dir))
(let ((modflag (buffer-modified-p))
(to-file (replace-regexp-in-string
(concat "^" (regexp-quote from-dir))
@@ -2727,7 +2727,7 @@ This function takes some pains to conform to `ls -lR'
output."
(setq switches (string-replace "R" "" switches))
(dolist (cur-ass dired-subdir-alist)
(let ((cur-dir (car cur-ass)))
- (and (file-in-directory-p 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)
@@ -2739,7 +2739,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 (file-in-directory-p 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 f3acc09377: ; Revert "Use file-in-directory-p instead of obsolete dired-in-this-tree-p",
Tassilo Horn <=