[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e403363 16/18: hydra.el (defhydra): Avoid eager macroexpan
From: |
Oleh Krehel |
Subject: |
[elpa] master e403363 16/18: hydra.el (defhydra): Avoid eager macroexpansion failure |
Date: |
Sat, 28 Mar 2015 15:04:29 +0000 |
branch: master
commit e403363fad96d39df7217528dfb723039d8239ff
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (defhydra): Avoid eager macroexpansion failure
* hydra.el (defhydra): Don't test with keymapp, unless the symbol is
bound. When the mode isn't loaded yet, the keymap symbol isn't bound.
---
hydra.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hydra.el b/hydra.el
index a3cdfac..13bf080 100644
--- a/hydra.el
+++ b/hydra.el
@@ -959,7 +959,9 @@ result of `defhydra'."
((hydra--callablep bind)
`(funcall ,bind ,final-key (function ,name)))
((and (symbolp bind)
- (keymapp (symbol-value bind)))
+ (if (boundp bind)
+ (keymapp (symbol-value bind))
+ t))
`(define-key ,bind ,final-key (function
,name)))
(t
(error "Invalid :bind property `%S' for head
%S" bind head)))))))
- [elpa] master f6697f3 02/18: Allow for the "%s`foo" spec., (continued)
- [elpa] master f6697f3 02/18: Allow for the "%s`foo" spec., Oleh Krehel, 2015/03/28
- [elpa] master 5c3ab46 08/18: hydra.el (hydra--format): Amend regex, Oleh Krehel, 2015/03/28
- [elpa] master 1bad0c4 09/18: hydra.el (hydra--format): Update regex order, Oleh Krehel, 2015/03/28
- [elpa] master 03771f4 01/18: hydra.el: Turn on lexical-binding, Oleh Krehel, 2015/03/28
- [elpa] master fe1cfee 10/18: hydra-examples.el (hydra-rectangle): Update, Oleh Krehel, 2015/03/28
- [elpa] master c8c6b8c 03/18: Fix blue/red heads with same cmd, Oleh Krehel, 2015/03/28
- [elpa] master 1290237 12/18: Disable key-chord for the duration of the hydra, Oleh Krehel, 2015/03/28
- [elpa] master cb4b78a 11/18: hydra-test.el (hydra-format-4): Add test, Oleh Krehel, 2015/03/28
- [elpa] master 640af46 13/18: hydra.el (defhydra): Improve docstring, Oleh Krehel, 2015/03/28
- [elpa] master 7843563 14/18: hydra.el (hydra--make-funcall): Add, Oleh Krehel, 2015/03/28
- [elpa] master e403363 16/18: hydra.el (defhydra): Avoid eager macroexpansion failure,
Oleh Krehel <=
- [elpa] master 5032ec7 15/18: hydra.el (defhydra): Simplify and improve the key binding code, Oleh Krehel, 2015/03/28
- [elpa] master 4a6a31d 17/18: hydra.el: Bump version, Oleh Krehel, 2015/03/28
- [elpa] master da45e68 18/18: Merge commit '4a6a31d6d4d479720f4b66091892b0cda2377346' from hydra, Oleh Krehel, 2015/03/28