branch: externals/leaf
commit 2d395ee3d4d16f6c17a471cc1d068f32fe6e527a
Merge: 0a698d240e 7cc38f9739
Author: Naoya Yamashita <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #525 from conao3/warn-after-keyword
Warn :after keyword when specified nil or any keywords
---
leaf.el | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/leaf.el b/leaf.el
index f36e76a05c..ee1d2d25bb 100644
--- a/leaf.el
+++ b/leaf.el
@@ -5,7 +5,7 @@
;; Author: Naoya Yamashita <[email protected]>
;; Maintainer: Naoya Yamashita <[email protected]>
;; Keywords: lisp settings
-;; Version: 4.5.4
+;; Version: 4.5.5
;; URL: https://github.com/conao3/leaf.el
;; Package-Requires: ((emacs "24.1"))
@@ -323,8 +323,24 @@ Sort by `leaf-sort-leaf--values-plist' in this order.")
"Normalize rule.")
(defvar leaf-verify
- '(((memq leaf--key (list :package))
+ '(((memq leaf--key '(:package))
(if (not (equal '(nil) (car leaf--value))) leaf--value nil))
+ ((memq leaf--key '(:after))
+ (delq nil
+ (mapcar
+ (lambda (elm)
+ (cond
+ ((eq elm nil)
+ (prog1 nil
+ (leaf-error "Error occurs in leaf block: %s" leaf--name)
+ (leaf-error "Attempt wait constant: nil; Please check your
specification")))
+ ((keywordp elm)
+ (prog1 nil
+ (leaf-error "Error occurs in leaf block: %s" leaf--name)
+ (leaf-error "Attempt wait constant keyword: %s; Please
check your specification" elm)))
+ (t
+ elm)))
+ leaf--value)))
((memq leaf--key (list
:hook :defun
:pl-setq :pl-pre-setq :pl-setq-default :pl-custom
