[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 82e6c54 067/399: counsel.el: Clean up compile make invocat
From: |
Oleh Krehel |
Subject: |
[elpa] master 82e6c54 067/399: counsel.el: Clean up compile make invocation |
Date: |
Sat, 20 Jul 2019 14:56:50 -0400 (EDT) |
branch: master
commit 82e6c541a0f35e076549810fd5387a5781c896cb
Author: Basil L. Contovounesios <address@hidden>
Commit: Basil L. Contovounesios <address@hidden>
counsel.el: Clean up compile make invocation
(counsel-compile-get-make-invocation): Fix typo in docstring and
function name; change all callers. Simplify logic.
---
counsel.el | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/counsel.el b/counsel.el
index 98ced9a..3cc7140 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5133,7 +5133,7 @@ to variable to `savehist-additional-variables'.")
(defvar counsel-compile-local-builds
'(counsel-compile-get-filtered-history
counsel-compile-get-build-directories
- counsel-compile-get-make-invocaton)
+ counsel-compile-get-make-invocation)
"Additional compile invocations to feed into `counsel-compile'.
This can either be a list of compile invocations strings or
@@ -5186,15 +5186,14 @@ filtering results."
"sort"))
"\n"))))
-(defun counsel-compile-get-make-invocaton (&optional blddir)
+(defun counsel-compile-get-make-invocation (&optional blddir)
"Have a look in the root directory for any build control files.
The optional BLDDIR is useful for other helpers that have found
- sub-directories that builds may be invoked in."
- (let* ((srcdir (funcall counsel-compile-root-function))
- (local-files (directory-files (or blddir srcdir))))
- (when (cl-member counsel-compile-make-pattern
- local-files :test #'string-match-p)
+subdirectories that builds may be invoked in."
+ (let ((srcdir (funcall counsel-compile-root-function)))
+ (when (directory-files (or blddir srcdir) nil
+ counsel-compile-make-pattern t)
(counsel--get-make-targets srcdir blddir))))
(defun counsel--find-build-subdir (srcdir)
- [elpa] master 3c16fa1 055/399: counsel.el (counsel-compile): Clean up, (continued)
- [elpa] master 3c16fa1 055/399: counsel.el (counsel-compile): Clean up, Oleh Krehel, 2019/07/20
- [elpa] master 876b4ac 059/399: counsel.el (counsel-compile): Minor cleanup, Oleh Krehel, 2019/07/20
- [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 <=
- [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, 2019/07/20
- [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