[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/leaf 256abf5 14/18: Merge pull request #492 from Z572/f
From: |
Stefan Monnier |
Subject: |
[elpa] externals/leaf 256abf5 14/18: Merge pull request #492 from Z572/fix-leaf-find-in-embedded-leaf-block |
Date: |
Wed, 2 Jun 2021 18:28:03 -0400 (EDT) |
branch: externals/leaf
commit 256abf5b5734da8caee111ac7f9cc14b5125d4e6
Merge: eb8ce41 c565595
Author: Naoya Yamashita <conao3@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #492 from Z572/fix-leaf-find-in-embedded-leaf-block
Fix `leaf-find' in embedded leaf block.
---
leaf.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/leaf.el b/leaf.el
index 2b1a2a1..40ba1f8 100644
--- a/leaf.el
+++ b/leaf.el
@@ -5,7 +5,7 @@
;; Author: Naoya Yamashita <conao3@gmail.com>
;; Maintainer: Naoya Yamashita <conao3@gmail.com>
;; Keywords: lisp settings
-;; Version: 4.4.6
+;; Version: 4.4.7
;; URL: https://github.com/conao3/leaf.el
;; Package-Requires: ((emacs "24.1"))
@@ -63,6 +63,7 @@ Same as `list' but this macro does not evaluate any
arguments."
(defvar leaf--body)
(defvar leaf--rest)
(defvar leaf--autoload)
+(defvar leaf--load-file-name nil)
(defvar leaf-keywords
(leaf-list
@@ -153,7 +154,7 @@ Same as `list' but this macro does not evaluate any
arguments."
`(,@(mapcar (lambda (elm) `(,(car elm) 1))
leaf--value) ,@leaf--body))
:leaf-defer (if (and leaf--body (eval (car leaf--value))
(leaf-list-memq leaf-defer-keywords (leaf-plist-keys leaf--raw)))
- `((eval-after-load ',leaf--name '(progn
,@leaf--body))) `(,@leaf--body))
+ `((eval-after-load ',leaf--name '(let
((leaf--load-file-name ,load-file-name)) ,@leaf--body))) `(,@leaf--body))
:setq `(,@(mapcar (lambda (elm) `(setq ,(car elm) ,(cdr elm)))
leaf--value) ,@leaf--body)
:setq-default `(,@(mapcar (lambda (elm) `(setq-default ,(car elm)
,(cdr elm))) leaf--value) ,@leaf--body)
@@ -637,7 +638,8 @@ see `alist-get'."
(defun leaf-this-file ()
"Return path to this file."
- (or load-file-name
+ (or leaf--load-file-name
+ load-file-name
(and (boundp 'byte-compile-current-file) byte-compile-current-file)
buffer-file-name))
@@ -1065,9 +1067,7 @@ FN also accept list of FN."
(defmacro leaf-handler-leaf-path (name)
"Meta handler for :leaf-path for NAME."
- `(let ((file (or load-file-name
- buffer-file-name
- byte-compile-current-file)))
+ `(let ((file (leaf-this-file)))
(unless (boundp 'leaf--paths) (defvar leaf--paths nil))
(when file
(add-to-list 'leaf--paths (cons ',name file)))))
- [elpa] externals/leaf 1263f8a 05/18: tagged v4.4.5, (continued)
- [elpa] externals/leaf 1263f8a 05/18: tagged v4.4.5, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 39c3bac 12/18: use leaf-this-file instead of hardcoding, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf c565595 13/18: tagged v4.4.7, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 4d48501 08/18: Merge remote-tracking branch 'origin/master' into refactor/typing-leaf-defaults, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf eb8ce41 10/18: Merge pull request #490 from zonuexe/refactor/typing-leaf-defaults, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf ad3b6a0 16/18: fix testcases, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf d3a0f73 17/18: tagged v4.4.8, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 75914b5 07/18: mention leaf-available-keywords instead of leaf-system-defaults, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 9e9d06c 09/18: tagged v4.4.6, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 1274e35 11/18: Merge remote-tracking branch 'origin/master' into fix-leaf-find-in-embedded-leaf-block, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf 256abf5 14/18: Merge pull request #492 from Z572/fix-leaf-find-in-embedded-leaf-block,
Stefan Monnier <=
- [elpa] externals/leaf b4b21de 15/18: add :leaf-defer-let system keyword and move :leaf-defer `let` hack, Stefan Monnier, 2021/06/02
- [elpa] externals/leaf bf870b1 18/18: Merge pull request #495 from conao3/feature#494, Stefan Monnier, 2021/06/02