[elpa] externals/leaf 2eea8f4 04/13: remove not supported version emacs docker
branch: externals/leaf commit 2eea8f4dec636cccdc0514d60db19ba015df0fa3 Author: Z572 <873216...@qq.com> Commit: Z572 <873216...@qq.com> remove not supported version emacs docker --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76758c6..a6181ba 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ TOP := $(dir $(lastword $(MAKEFILE_LIST))) UUID := $(shell ((uuidgen > /dev/null 2>&1 && uuidgen) || echo $$) | cut -c -7) -UBUNTU_EMACS := 23.4 24.1 24.5 25.1 +UBUNTU_EMACS := 24.1 24.5 25.1 ALPINE_EMACS := 25.3 26.1 26.2 DOCKER_EMACS := $(UBUNTU_EMACS:%=ubuntu-min-%) $(ALPINE_EMACS:%=alpine-min-%)
[elpa] externals/leaf c66dede 03/13: rewrite Fix `leaf-find'in embedded leaf block
branch: externals/leaf commit c66dede08ddb40c4de9bb74aebe75994a5447039 Author: Z572 <873216...@qq.com> Commit: Z572 <873216...@qq.com> rewrite Fix `leaf-find'in embedded leaf block --- leaf.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/leaf.el b/leaf.el index dee8315..5c9a62a 100644 --- a/leaf.el +++ b/leaf.el @@ -152,10 +152,10 @@ Same as `list' but this macro does not evaluate any arguments." :global-minor-mode (progn (mapc (lambda (elm) (leaf-register-autoload (car elm) (cdr elm))) leaf--value) `(,@(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 '(let ((leaf--load-file-name ,load-file-name)) ,@leaf--body))) `(,@leaf--body)) - + :leaf-defer(let* ((eval-after-p (and leaf--body (eval (car leaf--value)) (leaf-list-memq leaf-defer-keywords (leaf-plist-keys leaf--raw + (file (leaf-this-file)) + (let-or-progn (if file `(let ((leaf--load-file-name ,file))) '(progn +(if eval-after-p `((eval-after-load ',leaf--name '(,@let-or-progn ,@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) :setf `(,@(mapcar (lambda (elm) `(setf ,(car elm) ,(cdr elm))) leaf--value) ,@leaf--body)
[elpa] externals/leaf 024ea5f 08/13: Merge pull request #498 from conao3/feature#497
branch: externals/leaf commit 024ea5f956756e46afca5548f0e5f9e499503d6c Merge: af0d4d8 37dd2ba Author: Naoya Yamashita Commit: GitHub Merge pull request #498 from conao3/feature#497 defun -> defsubst; leaf-this-file is expanded in :leaf-path Sexp --- leaf.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaf.el b/leaf.el index 5c9a62a..3c1a1d8 100644 --- a/leaf.el +++ b/leaf.el @@ -636,7 +636,7 @@ see `alist-get'." (when load-file-name (format " at `%s'" load-file-name -(defun leaf-this-file () +(defsubst leaf-this-file () "Return path to this file." (or leaf--load-file-name load-file-name
[elpa] externals/leaf updated (bf870b1 -> a4fd520)
monnier pushed a change to branch externals/leaf. from bf870b1 Merge pull request #495 from conao3/feature#494 new 99d64eb Revert "add :leaf-defer-let system keyword and move :leaf-defer `let` hack" new ed1b50d Revert "fix testcases" new c66dede rewrite Fix `leaf-find'in embedded leaf block new 2eea8f4 remove not supported version emacs docker new 0bd023a fix testcases new af0d4d8 Merge pull request #496 from Z572/fix-leaf-find-in-embedded-leaf-block-2 new 37dd2ba defun -> defsubst; leaf-this-file is expanded in :leaf-path Sexp new 024ea5f Merge pull request #498 from conao3/feature#497 new 34f96a4 use bound-and-true-p instead of just eval variable new 58d4326 Merge pull request #499 from conao3/feature#497-2 new db9676b add added doc keyword new 9a20d00 tagged v4.5.2 new a4fd520 Merge pull request #500 from conao3/feature-leaf-keywords#145 Summary of changes: Makefile | 2 +- leaf-tests.el | 1 - leaf.el | 27 --- 3 files changed, 13 insertions(+), 17 deletions(-)
[elpa] externals/leaf 58d4326 10/13: Merge pull request #499 from conao3/feature#497-2
branch: externals/leaf commit 58d432689a23f440573e5a095b8b4998d8c7bfd0 Merge: 024ea5f 34f96a4 Author: Naoya Yamashita Commit: GitHub Merge pull request #499 from conao3/feature#497-2 Use bound-and-true-p instead of just eval variable --- leaf.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leaf.el b/leaf.el index 3c1a1d8..0f8d725 100644 --- a/leaf.el +++ b/leaf.el @@ -638,9 +638,9 @@ see `alist-get'." (defsubst leaf-this-file () "Return path to this file." - (or leaf--load-file-name + (or (bound-and-true-p leaf--load-file-name) + (bound-and-true-p byte-compile-current-file) load-file-name - (and (boundp 'byte-compile-current-file) byte-compile-current-file) buffer-file-name))
[elpa] externals/leaf af0d4d8 06/13: Merge pull request #496 from Z572/fix-leaf-find-in-embedded-leaf-block-2
branch: externals/leaf commit af0d4d8daaa323c34502d3cbea85ec8f70b06c00 Merge: bf870b1 0bd023a Author: Naoya Yamashita Commit: GitHub Merge pull request #496 from Z572/fix-leaf-find-in-embedded-leaf-block-2 Fix leaf find in embedded leaf block 2 --- Makefile | 2 +- leaf-tests.el | 1 - leaf.el | 18 +++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 76758c6..a6181ba 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ TOP := $(dir $(lastword $(MAKEFILE_LIST))) UUID := $(shell ((uuidgen > /dev/null 2>&1 && uuidgen) || echo $$) | cut -c -7) -UBUNTU_EMACS := 23.4 24.1 24.5 25.1 +UBUNTU_EMACS := 24.1 24.5 25.1 ALPINE_EMACS := 25.3 26.1 26.2 DOCKER_EMACS := $(UBUNTU_EMACS:%=ubuntu-min-%) $(ALPINE_EMACS:%=alpine-min-%) diff --git a/leaf-tests.el b/leaf-tests.el index bf87adf..3fb5534 100644 --- a/leaf-tests.el +++ b/leaf-tests.el @@ -156,7 +156,6 @@ Example: (setq leaf-expand-leaf-defun nil) (setq leaf-expand-leaf-defvar nil) (setq leaf-expand-leaf-path nil) -(setq leaf-expand-leaf-defer-let nil) (cort-deftest-with-macroexpand leaf/none '(((leaf leaf) diff --git a/leaf.el b/leaf.el index 9bec14d..5c9a62a 100644 --- a/leaf.el +++ b/leaf.el @@ -152,14 +152,10 @@ Same as `list' but this macro does not evaluate any arguments." :global-minor-mode (progn (mapc (lambda (elm) (leaf-register-autoload (car elm) (cdr elm))) leaf--value) `(,@(mapcar (lambda (elm) `(,(car elm) 1)) leaf--value) ,@leaf--body)) - - :leaf-defer-let(if (and leaf--body (eval (car leaf--value)) - (let ((defer--value (plist-get leaf--raw :leaf-defer))) (eval (car defer--value))) - (leaf-list-memq leaf-defer-keywords (leaf-plist-keys leaf--raw))) - `((let ((leaf--load-file-name ,load-file-name)) ,(print leaf-expand-minimally) ,@leaf--body)) `(,@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)) - + :leaf-defer(let* ((eval-after-p (and leaf--body (eval (car leaf--value)) (leaf-list-memq leaf-defer-keywords (leaf-plist-keys leaf--raw + (file (leaf-this-file)) + (let-or-progn (if file `(let ((leaf--load-file-name ,file))) '(progn +(if eval-after-p `((eval-after-load ',leaf--name '(,@let-or-progn ,@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) :setf `(,@(mapcar (lambda (elm) `(setf ,(car elm) ,(cdr elm))) leaf--value) ,@leaf--body) @@ -378,8 +374,8 @@ Sort by `leaf-sort-leaf--values-plist' in this order.") :group 'leaf) (defvar leaf-system-defaults (list - :leaf-autoload t :leaf-defer-let t :leaf-defer t - :leaf-protect t :leaf-defun t :leaf-defvar t :leaf-path t) + :leaf-autoload t :leaf-defer t :leaf-protect t + :leaf-defun t :leaf-defvar t :leaf-path t) "The value for all `leaf' blocks for leaf system.") (defcustom leaf-defer-keywords (list @@ -403,7 +399,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 :leaf-path :leaf-defer-let) +(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)
[elpa] externals/leaf 37dd2ba 07/13: defun -> defsubst; leaf-this-file is expanded in :leaf-path Sexp
branch: externals/leaf commit 37dd2ba1203a8d3b385c175bcc3b5928ec546b96 Author: Naoya Yamashita Commit: Naoya Yamashita defun -> defsubst; leaf-this-file is expanded in :leaf-path Sexp --- leaf.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaf.el b/leaf.el index 5c9a62a..3c1a1d8 100644 --- a/leaf.el +++ b/leaf.el @@ -636,7 +636,7 @@ see `alist-get'." (when load-file-name (format " at `%s'" load-file-name -(defun leaf-this-file () +(defsubst leaf-this-file () "Return path to this file." (or leaf--load-file-name load-file-name
[elpa] externals/leaf 9a20d00 12/13: tagged v4.5.2
branch: externals/leaf commit 9a20d0094d8b4452bba93b6b5543dd21c174ff23 Author: Naoya Yamashita Commit: Naoya Yamashita tagged v4.5.2 --- leaf.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaf.el b/leaf.el index 51b1ae9..4993726 100644 --- a/leaf.el +++ b/leaf.el @@ -5,7 +5,7 @@ ;; Author: Naoya Yamashita ;; Maintainer: Naoya Yamashita ;; Keywords: lisp settings -;; Version: 4.4.8 +;; Version: 4.5.2 ;; URL: https://github.com/conao3/leaf.el ;; Package-Requires: ((emacs "24.1"))
[elpa] externals/leaf a4fd520 13/13: Merge pull request #500 from conao3/feature-leaf-keywords#145
branch: externals/leaf commit a4fd520f5c31f54e0797155866e0b35df277664e Merge: 58d4326 9a20d00 Author: Naoya Yamashita Commit: GitHub Merge pull request #500 from conao3/feature-leaf-keywords#145 Add :added document keyword --- leaf.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/leaf.el b/leaf.el index 0f8d725..4993726 100644 --- a/leaf.el +++ b/leaf.el @@ -5,7 +5,7 @@ ;; Author: Naoya Yamashita ;; Maintainer: Naoya Yamashita ;; Keywords: lisp settings -;; Version: 4.4.8 +;; Version: 4.5.2 ;; URL: https://github.com/conao3/leaf.el ;; Package-Requires: ((emacs "24.1")) @@ -89,6 +89,7 @@ Same as `list' but this macro does not evaluate any arguments." :tag `(,@leaf--body) :file `(,@leaf--body) :url `(,@leaf--body) + :added `(,@leaf--body) :emacs<(when leaf--body `((when (version< emacs-version ,leaf--value) ,@leaf--body))) :emacs<= (when leaf--body `((when (version<= emacs-version ,leaf--value) ,@leaf--body)))
[elpa] externals/leaf 99d64eb 01/13: Revert "add :leaf-defer-let system keyword and move :leaf-defer `let` hack"
branch: externals/leaf commit 99d64eb8afed3842e05853510703c944f2fa3516 Author: Z572 <873216...@qq.com> Commit: Z572 <873216...@qq.com> Revert "add :leaf-defer-let system keyword and move :leaf-defer `let` hack" This reverts commit b4b21de5f2aa2b468c478363f5dd4ee26943cb79. --- leaf.el | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/leaf.el b/leaf.el index 9bec14d..dee8315 100644 --- a/leaf.el +++ b/leaf.el @@ -153,12 +153,8 @@ Same as `list' but this macro does not evaluate any arguments." (mapc (lambda (elm) (leaf-register-autoload (car elm) (cdr elm))) leaf--value) `(,@(mapcar (lambda (elm) `(,(car elm) 1)) leaf--value) ,@leaf--body)) - :leaf-defer-let(if (and leaf--body (eval (car leaf--value)) - (let ((defer--value (plist-get leaf--raw :leaf-defer))) (eval (car defer--value))) - (leaf-list-memq leaf-defer-keywords (leaf-plist-keys leaf--raw))) - `((let ((leaf--load-file-name ,load-file-name)) ,(print leaf-expand-minimally) ,@leaf--body)) `(,@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) @@ -378,8 +374,8 @@ Sort by `leaf-sort-leaf--values-plist' in this order.") :group 'leaf) (defvar leaf-system-defaults (list - :leaf-autoload t :leaf-defer-let t :leaf-defer t - :leaf-protect t :leaf-defun t :leaf-defvar t :leaf-path t) + :leaf-autoload t :leaf-defer t :leaf-protect t + :leaf-defun t :leaf-defvar t :leaf-path t) "The value for all `leaf' blocks for leaf system.") (defcustom leaf-defer-keywords (list @@ -403,7 +399,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 :leaf-path :leaf-defer-let) +(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)
[elpa] externals/leaf 34f96a4 09/13: use bound-and-true-p instead of just eval variable
branch: externals/leaf commit 34f96a45d22913eaccf84fc382092d51c0fc5dd4 Author: Naoya Yamashita Commit: Naoya Yamashita use bound-and-true-p instead of just eval variable with situations where user don't (require 'leaf). --- leaf.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leaf.el b/leaf.el index 3c1a1d8..0f8d725 100644 --- a/leaf.el +++ b/leaf.el @@ -638,9 +638,9 @@ see `alist-get'." (defsubst leaf-this-file () "Return path to this file." - (or leaf--load-file-name + (or (bound-and-true-p leaf--load-file-name) + (bound-and-true-p byte-compile-current-file) load-file-name - (and (boundp 'byte-compile-current-file) byte-compile-current-file) buffer-file-name))
[elpa] externals/leaf db9676b 11/13: add added doc keyword
branch: externals/leaf commit db9676b3a11ffd7ebc34dcf6848ca36dcd1f4daf Author: Naoya Yamashita Commit: Naoya Yamashita add added doc keyword --- leaf.el | 1 + 1 file changed, 1 insertion(+) diff --git a/leaf.el b/leaf.el index 0f8d725..51b1ae9 100644 --- a/leaf.el +++ b/leaf.el @@ -89,6 +89,7 @@ Same as `list' but this macro does not evaluate any arguments." :tag `(,@leaf--body) :file `(,@leaf--body) :url `(,@leaf--body) + :added `(,@leaf--body) :emacs<(when leaf--body `((when (version< emacs-version ,leaf--value) ,@leaf--body))) :emacs<= (when leaf--body `((when (version<= emacs-version ,leaf--value) ,@leaf--body)))
[elpa] externals/leaf ed1b50d 02/13: Revert "fix testcases"
branch: externals/leaf commit ed1b50dac789b70a143a33e84f5680813b40d437 Author: Z572 <873216...@qq.com> Commit: Z572 <873216...@qq.com> Revert "fix testcases" This reverts commit ad3b6a0bfef47cabc180a46057492c5de90acaa6. --- leaf-tests.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/leaf-tests.el b/leaf-tests.el index bf87adf..3a8e607 100644 --- a/leaf-tests.el +++ b/leaf-tests.el @@ -156,7 +156,6 @@ Example: (setq leaf-expand-leaf-defun nil) (setq leaf-expand-leaf-defvar nil) (setq leaf-expand-leaf-path nil) -(setq leaf-expand-leaf-defer-let nil) (cort-deftest-with-macroexpand leaf/none '(((leaf leaf) @@ -2342,7 +2341,7 @@ Example: (leaf-init))) ((leaf-handler-leaf-path leaf) - (let ((file (leaf-this-file))) + (let ((file (or load-file-name buffer-file-name byte-compile-current-file))) (unless (boundp 'leaf--paths) (defvar leaf--paths nil)) (when file (add-to-list 'leaf--paths (cons 'leaf file)))
[elpa] externals/leaf 0bd023a 05/13: fix testcases
branch: externals/leaf commit 0bd023a6b4720c42cc020a127cfc6b199f95bf06 Author: Z572 <873216...@qq.com> Commit: Z572 <873216...@qq.com> fix testcases --- leaf-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaf-tests.el b/leaf-tests.el index 3a8e607..3fb5534 100644 --- a/leaf-tests.el +++ b/leaf-tests.el @@ -2341,7 +2341,7 @@ Example: (leaf-init))) ((leaf-handler-leaf-path leaf) - (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 'leaf file)))
