@map: macroexp-progn => `(progn

This commit is contained in:
Henrik Lissner 2017-02-11 00:48:57 -05:00
parent 7ef87546cc
commit f8505e1c7e

View file

@ -265,22 +265,22 @@ Example
(push (cond ((and keymaps states) (push (cond ((and keymaps states)
(unless (featurep 'evil) (unless (featurep 'evil)
(throw 'skip 'evil)) (throw 'skip 'evil))
(macroexp-progn `(progn
(mapcar (lambda (keymap) `(evil-define-key* ',states ,keymap ,key ,def)) ,@(mapcar (lambda (keymap) `(evil-define-key* ',states ,keymap ,key ,def))
keymaps))) keymaps)))
(keymaps (keymaps
(macroexp-progn `(progn
(mapcar (lambda (keymap) `(define-key ,keymap ,key ,def)) ,@(mapcar (lambda (keymap) `(define-key ,keymap ,key ,def))
keymaps))) keymaps)))
(states (states
(unless (featurep 'evil) (unless (featurep 'evil)
(throw 'skip 'evil)) (throw 'skip 'evil))
(macroexp-progn `(progn
(mapcar (lambda (state) ,@(mapcar (lambda (state)
`(define-key `(define-key
,(intern (format "evil-%s-state-%smap" state (if local "local-" ""))) ,(intern (format "evil-%s-state-%smap" state (if local "local-" "")))
,key ,def)) ,key ,def))
states))) states)))
(t `(,(if local 'local-set-key 'global-set-key) (t `(,(if local 'local-set-key 'global-set-key)
,key ,def))) ,key ,def)))
forms)) forms))
@ -288,7 +288,7 @@ Example
local nil))) local nil)))
(t (user-error "Invalid key %s" key)))) (t (user-error "Invalid key %s" key))))
(macroexp-progn (reverse forms))))) `(progn ,@(reverse forms)))))
(provide 'core-lib) (provide 'core-lib)
;;; core-lib.el ends here ;;; core-lib.el ends here