[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6524a2c 19/24: hydra.el (hydra-fontify-head-default): Fixu
From: |
Oleh Krehel |
Subject: |
[elpa] master 6524a2c 19/24: hydra.el (hydra-fontify-head-default): Fixup |
Date: |
Fri, 01 May 2015 14:27:21 +0000 |
branch: master
commit 6524a2c24c882d82b0a4339682950d477474d754
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra-fontify-head-default): Fixup
* hydra.el (hydra-fontify-head-default): Use head-exit. The heads have
been pre-processed to have it always set.
* hydra-test.el (hydra-format-4): Update test. The heads are passed to
`hydra--format' in the pre-processed state now (color and hint expanded).
---
hydra-test.el | 2 +-
hydra.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hydra-test.el b/hydra-test.el
index 1c1ab2b..0fc82a1 100644
--- a/hydra-test.el
+++ b/hydra-test.el
@@ -1040,7 +1040,7 @@ _f_ auto-fill-mode: %`auto-fill-function
nil
'(nil nil :hint nil)
"\n_j_,_k_"
- '(("j" nil) ("k" nil)))
+ '(("j" nil nil :exit t) ("k" nil nil :exit t)))
'(concat (format "%s,%s"
#("j" 0 1 (face hydra-face-blue))
#("k" 0 1 (face hydra-face-blue))) ""))))
diff --git a/hydra.el b/hydra.el
index edc24a2..33ba508 100644
--- a/hydra.el
+++ b/hydra.el
@@ -441,7 +441,7 @@ HEAD's binding is returned as a string with a colored face."
(run 'pink)
(t 'red)))))
(when (and (null (cadr head))
- (not (eq head-color 'blue)))
+ (not head-exit))
(hydra--complain "nil cmd can only be blue"))
(propertize (car head) 'face
(cl-case head-color
- [elpa] master c43e1cf 08/24: Add `lv-delete-window' function, (continued)
- [elpa] master c43e1cf 08/24: Add `lv-delete-window' function, Oleh Krehel, 2015/05/01
- [elpa] master b9d0687 09/24: Update `outline-regexp' and `indent-tabs-mode' file locals, Oleh Krehel, 2015/05/01
- [elpa] master 01248b1 10/24: Use one less ; for local vars, Oleh Krehel, 2015/05/01
- [elpa] master 00d2c0c 11/24: Add lv-force-update, Oleh Krehel, 2015/05/01
- [elpa] master 824f105 12/24: Optionally separate lv window and echo area using a thin line, Oleh Krehel, 2015/05/01
- [elpa] master dd02b16 13/24: .dir-locals.el: Add, Oleh Krehel, 2015/05/01
- [elpa] master bf48e63 14/24: lv.el (lv-force-update): Be nil by default, Oleh Krehel, 2015/05/01
- [elpa] master 0ae560a 15/24: lv.el (lv-message): Use `lv-use-separator', Oleh Krehel, 2015/05/01
- [elpa] master 270c38b 16/24: Add a work-around for pop-to-buffer / dedicated bug, Oleh Krehel, 2015/05/01
- [elpa] master 8db62bf 17/24: Make *LV* window fixed size, Oleh Krehel, 2015/05/01
- [elpa] master 6524a2c 19/24: hydra.el (hydra-fontify-head-default): Fixup,
Oleh Krehel <=
- [elpa] master 319ac87 20/24: hydra.el (hydra-key-format-spec): Declare obsolete, Oleh Krehel, 2015/05/01
- [elpa] master c78367f 21/24: hydra.el (hydra-cell-format): Change to defvar, Oleh Krehel, 2015/05/01
- [elpa] master 2bc9146 22/24: hydra.el: Use add/remove-function. Fix warning., Oleh Krehel, 2015/05/01
- [elpa] master 370a862 18/24: Repurpose `hydra--complain' for debugging, Oleh Krehel, 2015/05/01
- [elpa] master 1380f8c 23/24: hydra.el: Bump version, Oleh Krehel, 2015/05/01
- [elpa] master fddedd2 24/24: Merge commit '1380f8c1a51f31514125a08f632d017cdfb8e26e' from hydra, Oleh Krehel, 2015/05/01