[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a37d4e3 072/399: counsel.el (counsel-compile): fix breakag
From: |
Oleh Krehel |
Subject: |
[elpa] master a37d4e3 072/399: counsel.el (counsel-compile): fix breakage to subdir recursion |
Date: |
Sat, 20 Jul 2019 14:56:51 -0400 (EDT) |
branch: master
commit a37d4e34ef566df5cfc42c725c3c97252f41ab40
Author: Alex Bennée <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel-compile): fix breakage to subdir recursion
Commit 1439e8d broke subdir recursion by only passing the directory
containing the subdirs rather than the final subdir. Fix this by
partially reverting the change while keeping the new cleaner
structure.
---
counsel.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/counsel.el b/counsel.el
index 7e989ed..2d54e07 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5233,13 +5233,14 @@ subdirectories that builds may be invoked in."
"Return a list of potential build directories."
(let* ((srcdir (or dir (counsel--compile-root)))
(blddir (counsel--find-build-subdir srcdir))
- (props `(srcdir ,srcdir blddir ,blddir recursive t)))
- (mapcar (lambda (s)
- (setq s (concat (propertize "Select build in "
- 'face 'font-lock-warning-face)
- (propertize s 'face 'dired-directory)))
- (add-text-properties 0 (length s) props s)
- s)
+ (props `(srcdir ,srcdir recursive t))
+ (fmt (concat (propertize "Select build in "
+ 'face 'font-lock-warning-face)
+ (propertize "%s" 'face 'dired-directory))))
+ (mapcar (lambda (subdir)
+ (let ((s (format fmt subdir)))
+ (add-text-properties 0 (length s) `(blddir ,subdir ,@props) s)
+ s))
(and blddir (counsel--get-build-subdirs blddir)))))
;; No easy way to make directory local, would buffer local make more sense?
- [elpa] master 072f238 058/399: counsel.el: Capitalize proper noun "Git", (continued)
- [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, 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 <=
- [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, 2019/07/20