Fix eager expansion of evilify macro

Resolves #920
This commit is contained in:
syl20bnr 2015-03-25 01:16:27 -04:00
parent 6fa63b8dbb
commit 766625558b

View file

@ -64,14 +64,14 @@
BODY is a list of additional key bindings to apply for the given MAP in
`evilified state'."
`(progn (unless (memq ',mode evil-evilified-state--modes)
(push ',mode evil-evilified-state--modes))
(unless (or (bound-and-true-p holy-mode)
(memq ',mode evil-evilified-state-modes))
(delq ',mode evil-emacs-state-modes)
(push ',mode evil-evilified-state-modes))
(unless ,(null body)
(evil-define-key 'evilified ,map ,@body))))
(let ((defkey (when body `(evil-define-key 'evilified ,map ,@body))))
`(progn (unless (memq ',mode evil-evilified-state--modes)
(push ',mode evil-evilified-state--modes))
(unless (or (bound-and-true-p holy-mode)
(memq ',mode evil-evilified-state-modes))
(delq ',mode evil-emacs-state-modes)
(push ',mode evil-evilified-state-modes))
(unless ,(null defkey) (,@defkey)))))
(provide 'evil-evilified-state)