[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/leaf 86b4b85 03/46: implement leaf--create-custom-comme
From: |
Stefan Monnier |
Subject: |
[elpa] externals/leaf 86b4b85 03/46: implement leaf--create-custom-comment and use it |
Date: |
Mon, 15 Mar 2021 22:20:42 -0400 (EDT) |
branch: externals/leaf
commit 86b4b850738e4f2acf4160f730efb7b5e8414c6d
Author: Naoya Yamashita <conao3@gmail.com>
Commit: Naoya Yamashita <conao3@gmail.com>
implement leaf--create-custom-comment and use it
---
leaf.el | 38 +++++++++++++++++++++++++++++---------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/leaf.el b/leaf.el
index b7fdd40..2d0b09f 100644
--- a/leaf.el
+++ b/leaf.el
@@ -134,11 +134,11 @@ Same as `list' but this macro does not evaluate any
arguments."
:pl-pre-setq `(,@(mapcar (lambda (elm) `(setq ,(car elm)
(leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm)))) leaf--value)
,@leaf--body)
:auth-pre-setq `(,@(mapcar (lambda (elm) `(setq ,(car elm)
(leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm)))) leaf--value)
,@leaf--body)
- :custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) ,(cdr elm) ,(format "Customized with leaf in %s %s block"
load-file-name leaf--name))) leaf--value) ,@leaf--body)
- :custom* `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) ,(cdr elm) ,(format "Customized with leaf in %s %s block"
load-file-name leaf--name))) leaf--value) ,@leaf--body)
- :pl-custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) (leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm)) ,(format
"Customized in leaf `%s' from plstore `%s' at %s" leaf--name (symbol-name (cdr
elm)) load-file-name))) leaf--value) ,@leaf--body)
- :auth-custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) (leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm)) ,(format
"Customized in leaf `%s' from plstore `%s' at %s" leaf--name (symbol-name (cdr
elm)) load-file-name))) leaf--value) ,@leaf--body)
- :custom-face `((custom-set-faces ,@(mapcar (lambda (elm) `'(,(car
elm) ,(car (cddr elm)) nil ,(format "Customized with leaf in %s %s block"
load-file-name leaf--name))) leaf--value)) ,@leaf--body)
+ :custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) ,(cdr elm) ,(leaf--create-custom-comment :custom))) leaf--value)
,@leaf--body)
+ :custom* `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) ,(cdr elm) ,(leaf--create-custom-comment :custom*))) leaf--value)
,@leaf--body)
+ :pl-custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) (leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm))
,(leaf--create-custom-comment :pl-custom (cdr elm)))) leaf--value) ,@leaf--body)
+ :auth-custom `(,@(mapcar (lambda (elm) `(customize-set-variable
',(car elm) (leaf-handler-auth ,leaf--name ,(car elm) ,(cdr elm))
,(leaf--create-custom-comment :auth-custom (cdr elm)))) leaf--value)
,@leaf--body)
+ :custom-face `((custom-set-faces ,@(mapcar (lambda (elm) `'(,(car
elm) ,(car (cddr elm)) nil ,(leaf--create-custom-comment :custom-face)))
leaf--value)) ,@leaf--body)
:init `(,@leaf--value ,@leaf--body)
:require `(,@(mapcar (lambda (elm) `(require ',elm)) leaf--value)
,@leaf--body)
@@ -587,6 +587,16 @@ see `alist-get'."
"Raise error with type leaf. MESSAGE and ARGS is same form as `lwarn'."
(apply #'lwarn `(leaf :error ,message ,@args)))
+(defun leaf--create-custom-comment (type &rest args)
+ "Create message for TYPE using ARGS."
+ (concat
+ (format "Customized with leaf in `%s' block" leaf--name)
+ (when (memq type '(:pl-custom :auth-custom))
+ (let* ((store (pop args)))
+ (format " using `%s' plstore" store)))
+ (when load-file-name
+ (format " at `%s'" load-file-name))))
+
;;;; General functions for leaf
@@ -905,8 +915,14 @@ FN also accept list of FN."
`(condition-case err
(progn ,@body)
(error
- (display-warning 'leaf (format ,(format "Error in `%s' block at `%s'.
Error msg: %%s" name load-file-name)
- (error-message-string err))))))
+ (display-warning 'leaf (format
+ ,(concat
+ (format "Error in `%s' block" name)
+ (when load-file-name
+ (format " at `%s'" load-file-name))
+ "."
+ " Error msg: %s")
+ (error-message-string err))))))
(defmacro leaf-handler-package (name pkg _pin)
"Handler ensure PKG via PIN in NAME leaf block."
@@ -923,8 +939,12 @@ FN also accept list of FN."
(error
(display-warning 'leaf
(format
- ,(format "In `%s' block at `%s', failed to
:package of %s. Error msg: %%s"
- name load-file-name pkg)
+ ,(concat
+ (format "In `%s' block" name)
+ (when load-file-name
+ (format " at `%s'" load-file-name))
+ (format ", failed to :package of `%s'." pkg)
+ " Error msg: %s")
(error-message-string err)))))))))
(defmacro leaf-handler-auth (name sym store)
- [elpa] externals/leaf updated (ef0bdd4 -> b1fe4f2), Stefan Monnier, 2021/03/15
- [elpa] externals/leaf e0f84ad 05/46: tagged v4.3.3, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf a314668 04/46: fix test, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 6e9a4cc 02/46: unify expression; use `in <leafname> block at <filename>`, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 86b4b85 03/46: implement leaf--create-custom-comment and use it,
Stefan Monnier <=
- [elpa] externals/leaf e0c4b74 06/46: Merge pull request #467 from Z572/load-file-name, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf f425433 14/46: Revert "add :commands* keyword", Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 7936c2f 13/46: Revert "update document, tagged v4.3.4", Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 7cce6cc 15/46: tagged v4.3.5, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf e5c185e 21/46: handle no candidates situation, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf f1746b8 41/46: use leaf-this-file instead of just ref load-file-name, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 721319c 01/46: Add load-file-name in Warning, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf 562885f 08/46: README: add documentation about the leaf-find, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf c5ddde8 09/46: leaf-path: add test, Stefan Monnier, 2021/03/15
- [elpa] externals/leaf a82c47d 10/46: add :commands* keyword, Stefan Monnier, 2021/03/15