branch: elpa/dirvish
commit 7bb9d81f8a993aaee917b0990ba736301befe6e2
Author: Alex Lu <hellosimon1...@hotmail.com>
Commit: Alex Lu <hellosimon1...@hotmail.com>
refactor(core): rename `dirvish--window-selected-p`
---
dirvish-widgets.el | 3 +--
dirvish.el | 10 ++++++----
extensions/dirvish-fd.el | 3 +--
extensions/dirvish-side.el | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dirvish-widgets.el b/dirvish-widgets.el
index 13de8643c5..f7fbe2ebd9 100644
--- a/dirvish-widgets.el
+++ b/dirvish-widgets.el
@@ -307,9 +307,8 @@ GROUP-TITLES is a list of group titles."
(dirvish-define-mode-line path
"Path of file under the cursor."
(let* ((directory-abbrev-alist nil) ; TODO: support custom
`directory-abbrev-alist'
- (dv (dirvish-curr))
(index (dired-current-directory))
- (face (if (dirvish--window-selected-p dv) 'dired-header 'shadow))
+ (face (if (dirvish--selected-p) 'dired-header 'shadow))
(rmt (dirvish-prop :remote))
(abvname (if rmt (file-local-name index) (abbreviate-file-name
index)))
(host (propertize (if rmt (concat " " (substring rmt 1)) "")
diff --git a/dirvish.el b/dirvish.el
index b060ff714a..a8e608a2ba 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -431,10 +431,12 @@ ALIST is window arguments passed to
`window--display-buffer'."
entry
(complete-with-action action completions string pred)))))
-(defun dirvish--window-selected-p (dv)
- "Return t if session DV is selected."
- (eq (if (car (dv-layout dv)) (dv-root-window dv) (frame-selected-window))
- dirvish--selected-window))
+(defun dirvish--selected-p (&optional dv)
+ "Return t if session DV is selected.
+DV defaults to `dirvish-curr'."
+ (let ((dv (or dv (dirvish-curr))))
+ (eq (if (car (dv-layout dv)) (dv-root-window dv) (frame-selected-window))
+ dirvish--selected-window)))
(defun dirvish--scopes ()
"Return computed scopes according to `dirvish-scopes'."
diff --git a/extensions/dirvish-fd.el b/extensions/dirvish-fd.el
index 933a5a3374..a638113d99 100644
--- a/extensions/dirvish-fd.el
+++ b/extensions/dirvish-fd.el
@@ -218,8 +218,7 @@ Raise an error if fd executable is not available."
"Return a formatted string showing the DIRVISH-FD-ACTUAL-SWITCHES."
(pcase-let ((`(,globp ,casep ,ign-range ,types ,exts ,excludes)
(dirvish-prop :fd-arglist))
- (face (if (dirvish--window-selected-p (dirvish-curr))
- 'dired-header 'shadow)))
+ (face (if (dirvish--selected-p) 'dired-header 'shadow)))
(format " %s | %s"
(propertize "FD" 'face face)
(if (not (dirvish-prop :fd-time))
diff --git a/extensions/dirvish-side.el b/extensions/dirvish-side.el
index 96699d9660..6571ef761a 100644
--- a/extensions/dirvish-side.el
+++ b/extensions/dirvish-side.el
@@ -145,7 +145,7 @@ filename until the project root when opening a side
session."
(dirvish-define-mode-line project
"Return a string showing current project."
(let ((project (dirvish--get-project-root))
- (face (if (dirvish--window-selected-p (dirvish-curr)) 'dired-header
'shadow)))
+ (face (if (dirvish--selected-p) 'dired-header 'shadow)))
(if project
(setq project (file-name-base (directory-file-name project)))
(setq project "-"))
