[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/leaf 2d210be 24/46: expand :leaf-path keyword anytime b
From: |
Stefan Monnier |
Subject: |
[elpa] externals/leaf 2d210be 24/46: expand :leaf-path keyword anytime but set suppress-keywords |
Date: |
Mon, 15 Mar 2021 22:20:45 -0400 (EDT) |
branch: externals/leaf
commit 2d210bef3a221077a3c8e409e528dd142bbbaf0f
Author: Naoya Yamashita <conao3@gmail.com>
Commit: Naoya Yamashita <conao3@gmail.com>
expand :leaf-path keyword anytime but set suppress-keywords
---
leaf.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/leaf.el b/leaf.el
index 21ac969..4f2b57e 100644
--- a/leaf.el
+++ b/leaf.el
@@ -67,7 +67,7 @@ Same as `list' but this macro does not evaluate any
arguments."
(defvar leaf-keywords
(leaf-list
:disabled (unless (eval (car leaf--value)) `(,@leaf--body))
- :leaf-path (progn (when (and load-in-progress (eval (car
leaf--value))) (add-to-list 'leaf--paths `(,leaf--name . ,load-file-name)))
`(,@leaf--body))
+ :leaf-path (if (and leaf--body (eval (car leaf--value)))
`((leaf-handler-leaf-path ,leaf--name) ,@leaf--body) `(,@leaf--body))
:leaf-protect (if (and leaf--body (eval (car leaf--value)))
`((leaf-handler-leaf-protect ,leaf--name ,@leaf--body)) `(,@leaf--body))
:load-path `(,@(mapcar (lambda (elm) `(add-to-list 'load-path
,elm)) leaf--value) ,@leaf--body)
:load-path* `(,@(mapcar (lambda (elm) `(add-to-list 'load-path
(locate-user-emacs-file ,elm))) leaf--value) ,@leaf--body)
@@ -382,7 +382,7 @@ If non-nil, disabled keywords of
`leaf-expand-minimally-suppress-keywords'."
:type 'boolean
:group 'leaf)
-(defcustom leaf-expand-minimally-suppress-keywords '(:leaf-protect :leaf-defun
:leaf-defvar)
+(defcustom leaf-expand-minimally-suppress-keywords '(:leaf-protect :leaf-defun
:leaf-defvar :leaf-path)
"Suppress keywords when `leaf-expand-minimally' is non-nil."
:type 'sexp
:group 'leaf)
@@ -942,6 +942,11 @@ FN also accept list of FN."
(display-warning 'leaf (format ,(format "Error in `%s' block. Error
msg: %%s" name)
(error-message-string err))))))
+(defmacro leaf-handler-leaf-path (name)
+ "Meta handler for :leaf-path for NAME."
+ `(when load-in-progress
+ (add-to-list 'leaf--paths (cons ',name load-file-name))))
+
(defmacro leaf-handler-package (name pkg _pin)
"Handler ensure PKG via PIN in NAME leaf block."
`(unless (package-installed-p ',pkg)
- [elpa] externals/leaf 896da3e 44/46: fix leaf-find-regexp., (continued)
- [elpa] externals/leaf 896da3e 44/46: fix leaf-find-regexp., Stefan Monnier, 2021/03/15
- [elpa] externals/leaf b1fe4f2 46/46: Merge pull request #481 from Z572/fix-leaf-find-regexp, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf b64a2fa 40/46: fix test, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf d6c12f1 33/46: tagged v4.3.7, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 1db35d4 19/46: format sexp, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 39e0359 37/46: Merge pull request #480 from conao3/feature#479, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 1ee956d 42/46: tagged v4.3.9, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 31e1fac 07/46: Added support to find the leaf block., Stefan Monnier, 2021/03/15
- [elpa] externals/leaf bafd5c5a 18/46: move leaf-find-regexp definition, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf cb35aac 34/46: Merge pull request #478 from conao3/feature#477, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 2d210be 24/46: expand :leaf-path keyword anytime but set suppress-keywords,
Stefan Monnier <=
- [elpa] externals/leaf fbe9bfb 43/46: Merge pull request #468 from Z572/leaf-key-list-mode, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 38ef506 45/46: tagged v4.4.0, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 1695574 11/46: update document, tagged v4.3.4, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 005481d 28/46: tagged v4.3.6, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf fc8924d 27/46: add just eval-buffer, byte-compile situation, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf fe1003f 39/46: align load-file-name, Stefan Monnier, 2021/03/15