[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 8a40934 062/399: counsel.el: Clean up compile candidates l
From: |
Oleh Krehel |
Subject: |
[elpa] master 8a40934 062/399: counsel.el: Clean up compile candidates list |
Date: |
Sat, 20 Jul 2019 14:56:49 -0400 (EDT) |
branch: master
commit 8a409347dca90d7bf8486c6e003540fbb2bf5566
Author: Basil L. Contovounesios <address@hidden>
Commit: Basil L. Contovounesios <address@hidden>
counsel.el: Clean up compile candidates list
(counsel--get-compile-candidates): Follow Emacs docstring
conventions. Avoid destructively modifying lists returned by
counsel-compile-local-builds elements. Simplify logic.
---
counsel.el | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/counsel.el b/counsel.el
index 1c2fa61..11f4b64 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5248,24 +5248,18 @@ The optional BLDDIR is useful for other helpers that
have found
kept-history))
(defun counsel--get-compile-candidates (&optional dir)
- "Return the list of compile commands as directed by
-`counsel-compile-local-builds'."
+ "Return the list of compile commands.
+This is determined by `counsel-compile-local-builds', which see."
(let (cands)
- (if (stringp counsel-compile-local-builds)
- (setq cands (list counsel-compile-local-builds))
- (dolist (c counsel-compile-local-builds)
- (let ((more-cands
- (cond
- ((functionp c)
- (let ((fcands (funcall c dir)))
- (if (and fcands (nlistp fcands))
- (list fcands)
- fcands)))
- ((stringp c) (list c))
- ((listp c) c))))
- (when more-cands
- (setq cands (nconc cands more-cands)))))
- cands)))
+ ;; FIXME: Shouldn't `counsel-compile-local-builds' always be a list?
+ (dolist (cmds (if (listp counsel-compile-local-builds)
+ counsel-compile-local-builds
+ (list counsel-compile-local-builds)))
+ (when (functionp cmds)
+ (setq cmds (funcall cmds dir)))
+ (when cmds
+ (push (if (listp cmds) cmds (list cmds)) cands)))
+ (apply #'append (nreverse cands))))
;; This is a workaround to ensure we tag all the relevant metadata in
;; our compile history. This also allows M-x compile to do fancy
- [elpa] master a37d4e3 072/399: counsel.el (counsel-compile): fix breakage to subdir recursion, (continued)
- [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
- [elpa] master 4e07e6f 048/399: ivy.el (ivy-make-magic-action): Add docstring to the generated lambda, Oleh Krehel, 2019/07/20
- [elpa] master 8a40934 062/399: counsel.el: Clean up compile candidates list,
Oleh Krehel <=
- [elpa] master 0c30e3f 063/399: counsel.el: Minor compile history cleanup, Oleh Krehel, 2019/07/20
- [elpa] master 114ae96 070/399: counsel.el: Find project root more flexibly, Oleh Krehel, 2019/07/20
- [elpa] master 5aa263c 079/399: counsel.el (counsel-compile-make-pattern): Fix regex, Oleh Krehel, 2019/07/20
- [elpa] master cc50da2 080/399: counsel.el (counsel-dired-jump-args): Fix -type d, Oleh Krehel, 2019/07/20
- [elpa] master a473519 086/399: Fix error in ivy-make-magic-action, Oleh Krehel, 2019/07/20
- [elpa] master 9ce9e4e 090/399: counsel.el (counsel-compile-phony-pattern): Fixup, Oleh Krehel, 2019/07/20
- [elpa] master 1046fc7 095/399: ivy.el (ivy-avy): Use non-obsolete avy-process, Oleh Krehel, 2019/07/20
- [elpa] master 27add46 092/399: Anchor pcre lookaround patterns to bol, Oleh Krehel, 2019/07/20
- [elpa] master 3e1e905 083/399: Fix virtual buffers in counsel-switch-buffer, Oleh Krehel, 2019/07/20
- [elpa] master cbdc9c9 078/399: counsel.el (counsel--compile-get-make-targets): Rename, Oleh Krehel, 2019/07/20