[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f0d93cf 073/399: counsel.el (counsel-compile): counsel-com
From: |
Oleh Krehel |
Subject: |
[elpa] master f0d93cf 073/399: counsel.el (counsel-compile): counsel-compile-get-filtered-history |
Date: |
Sat, 20 Jul 2019 14:56:51 -0400 (EDT) |
branch: master
commit f0d93cfcb3bdb6f14c39e0c3cd1a764f9dcd3e69
Author: Alex Bennée <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel-compile): counsel-compile-get-filtered-history
Add some commentary and use file-in-directory-p instead of treating
paths and regexes.
---
counsel.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/counsel.el b/counsel.el
index 2d54e07..75b670d 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5243,7 +5243,10 @@ subdirectories that builds may be invoked in."
s))
(and blddir (counsel--get-build-subdirs blddir)))))
-;; No easy way to make directory local, would buffer local make more sense?
+;; This is a workaround for the fact there is no concept of "project"
+;; local variables (as opposed to for example buffer-local). So we
+;; store all our history in a global list filter out the results we
+;; don't want.
(defun counsel-compile-get-filtered-history (&optional dir)
"Return a compile history relevant to current project."
(let ((root (or dir (counsel--compile-root)))
@@ -5251,9 +5254,8 @@ subdirectories that builds may be invoked in."
(dolist (item counsel-compile-history)
(let ((srcdir (get-text-property 0 'srcdir item))
(blddir (get-text-property 0 'blddir item)))
- ;; FIXME: File names are not regexps!
- (when (or (and srcdir (string-match-p srcdir root))
- (and blddir (string-match-p blddir root)))
+ (when (or (and srcdir (file-in-directory-p srcdir root))
+ (and blddir (file-in-directory-p blddir root)))
(push item history))))
history))
- [elpa] master 56201b1 056/399: counsel.el: Remove cl-extra, (continued)
- [elpa] master 56201b1 056/399: counsel.el: Remove cl-extra, Oleh Krehel, 2019/07/20
- [elpa] master 859e3cb 061/399: counsel.el: Clean up compile history keeping, Oleh Krehel, 2019/07/20
- [elpa] master 072f238 058/399: counsel.el: Capitalize proper noun "Git", Oleh Krehel, 2019/07/20
- [elpa] master 5f5a263 054/399: counsel.el (counsel-compile): Add, Oleh Krehel, 2019/07/20
- [elpa] master adea72f 060/399: counsel.el: Simplify counsel-compile action, Oleh Krehel, 2019/07/20
- [elpa] master 50dc9e6 065/399: counsel.el (counsel--get-build-subdirs): Fix, Oleh Krehel, 2019/07/20
- [elpa] master 4e0d403 066/399: counsel.el (counsel--find-build-subdir): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 144e7d9 069/399: counsel.el: Clean up recent compile variables, Oleh Krehel, 2019/07/20
- [elpa] master 82e6c54 067/399: counsel.el: Clean up compile make invocation, Oleh Krehel, 2019/07/20
- [elpa] master bb58a29 071/399: counsel.el (counsel-ag): Fix error in non-Git directory, Oleh Krehel, 2019/07/20
- [elpa] master f0d93cf 073/399: counsel.el (counsel-compile): counsel-compile-get-filtered-history,
Oleh Krehel <=
- [elpa] master ce0c39e 076/399: counsel.el (counsel--git-root): Rename, Oleh Krehel, 2019/07/20
- [elpa] master a37d4e3 072/399: counsel.el (counsel-compile): fix breakage to subdir recursion, Oleh Krehel, 2019/07/20
- [elpa] master 86c904f 077/399: counsel.el (counsel-compile-root-functions): Change priority, Oleh Krehel, 2019/07/20
- [elpa] master c2788de 082/399: counsel.el (counsel--switch-buffer-update-fn): if to cond, Oleh Krehel, 2019/07/20
- [elpa] master 1439e8d 064/399: counsel.el: Simplify compile build dir collection, Oleh Krehel, 2019/07/20
- [elpa] master 7e8a362 068/399: counsel.el (counsel--get-make-targets): Clean up, Oleh Krehel, 2019/07/20
- [elpa] master d64b268 074/399: counsel.el (counsel-compile): counsel--get-build-subdirs, Oleh Krehel, 2019/07/20
- [elpa] master 6f0f32f 084/399: counsel.el (counsel-git-grep-count-function): Promote to defcustom, Oleh Krehel, 2019/07/20
- [elpa] master 25336fd 075/399: counsel.el (counsel-compile): counsel-compile-local-builds, Oleh Krehel, 2019/07/20
- [elpa] master db905cc 088/399: counsel.el (counsel-compile-phony-pattern): Use plain regex, Oleh Krehel, 2019/07/20