jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(navigation/consult): fix custom project directory lookup function

Browse Source
This commit is contained in:
Jim Myhrberg
2022-06-01 23:52:41 +01:00
parent 2c158e7ea8
commit c5b149497b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/navigation/siren-consult.el
View File

@@ -146,7 +146,9 @@ Only shows file-based buffers."
"Normalize directory DIR.
DIR can be project, not-project, nil or a path."
(cond
((or (eq dir 'project) (eq dir 'not-project)) (consult--project-root))
((or (eq dir 'project) (eq dir 'not-project)) (if consult-project-root-function
(funcall consult-project-root-function)
(consult--project-root)))
(dir (expand-file-name dir))))
(cl-defun siren-consult--buffer-query (&key sort directory mode as predicate (filter t)
@@ -188,10 +190,10 @@ AS is a conversion function."
(not (not (string-match-p include-re (buffer-name it)))))))))
(or (not root)
(when-let (dir (buffer-local-value 'default-directory it))
(let ((in-project (string-prefix-p root
(if (and (/= 0 (length dir)) (eq (aref dir 0) ?/))
dir
(expand-file-name dir)))))
(let* ((expanded-dir (if (and (/= 0 (length dir)) (eq (aref dir 0) ?/))
dir
(expand-file-name dir)))
(in-project (string-prefix-p root expanded-dir)))
(or (and not-project (not in-project))
(and (not not-project) in-project)))))
(or (not predicate) (funcall predicate it))