TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transient-state: Defer declaration of transient states

This commit is contained in:
justbur 2016-01-20 11:21:31 -05:00 committed by syl20bnr
parent bbcac824ef
commit f3e68b95a3
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
core/core-micro-state.el
View File

@ -303,6 +303,18 @@ pressed)."
"Return the name of the transient state function."
(intern (format "spacemacs/%S-transient-state/body" name)))
(defun spacemacs//transient-state-adjust-bindings (bindings to-remove to-add)
(append
(cl-remove-if
(lambda (bnd)
(and (boundp to-remove)
(listp (symbol-value to-remove))
(member (car bnd) (symbol-value to-remove))))
bindings)
(when (and (boundp to-add)
(listp (symbol-value to-add)))
(symbol-value to-add))))
(defface spacemacs-transient-state-title-face
'((t :inherit header-line))
"Face for title of transient states.")
@ -354,17 +366,6 @@ used."
(remove-bindings (intern (format "spacemacs-%s-transient-state-remove-bindings"
name)))
(bindings (spacemacs/mplist-get props :bindings))
(bindings (if (and (boundp remove-bindings)
(listp (symbol-value remove-bindings)))
(cl-remove-if
(lambda (bnd)
(member (car bnd) (symbol-value remove-bindings)))
bindings)
bindings))
(bindings (append bindings
(when (and (boundp add-bindings)
(listp (symbol-value add-bindings)))
(symbol-value add-bindings))))
(doc (or (plist-get props :doc) "\n"))
(title (plist-get props :title))
(hint-var (intern (format "%s/hint" func)))
@ -375,22 +376,27 @@ used."
(foreign-keys (plist-get props :foreign-keys))
(bindkeys (spacemacs//create-key-binding-form props body-func)))
`(progn
(defhydra ,func
(,(car entry-binding) ,(cadr entry-binding)
:hint ,hint
:columns ,columns
:foreign-keys ,foreign-keys
:body-pre ,entry-sexp
:before-exit ,exit-sexp)
,doc
,@bindings)
(when ,title
(setq ,hint-var
(list 'concat
(propertize ,title
'face 'spacemacs-transient-state-title-face)
"\n" ,hint-var)))
,@bindkeys)))
(add-hook 'spacemacs-transient-state-defs
(lambda ()
(eval
(append
'(defhydra ,func
(,(car entry-binding) ,(cadr entry-binding)
:hint ,hint
:columns ,columns
:foreign-keys ,foreign-keys
:body-pre ,entry-sexp
:before-exit ,exit-sexp)
,doc)
(spacemacs//transient-state-adjust-bindings
',bindings ',remove-bindings ',add-bindings)))
(when ,title
(setq ,hint-var
(list 'concat
(propertize ,title
'face 'spacemacs-transient-state-title-face)
"\n" ,hint-var)))
,@bindkeys)))))
(provide 'core-micro-state)