[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 688e8fd 23/72: hydra.el (hydra--head-color): fix for teal
From: |
Oleh Krehel |
Subject: |
[elpa] master 688e8fd 23/72: hydra.el (hydra--head-color): fix for teal color |
Date: |
Fri, 06 Mar 2015 13:04:08 +0000 |
branch: master
commit 688e8fdc06ebaf824f91723da8d30c01f20215de
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra--head-color): fix for teal color
---
hydra.el | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hydra.el b/hydra.el
index cfebf5e..a944723 100644
--- a/hydra.el
+++ b/hydra.el
@@ -225,9 +225,13 @@ Return DEFAULT if PROP is not in H."
(defun hydra--head-color (h body-color)
"Return the color of a Hydra head H with BODY-COLOR."
- (if (null (cadr h))
- 'blue
- (or (hydra--head-property h :color) body-color)))
+ (let ((col (hydra--head-property h :color)))
+ (cond ((null (cadr h))
+ 'blue)
+ ((null col)
+ body-color)
+ (t
+ col))))
(defun hydra--body-color (body)
"Return the color of BODY.
@@ -369,10 +373,10 @@ BODY-COLOR, BODY-PRE, BODY-POST, and OTHER-POST are used
as well."
(interactive)
,@(when body-pre (list body-pre))
(hydra-disable)
- ,@(when (eq color 'blue) '((hydra-cleanup)))
+ ,@(when (memq color '(blue teal)) '((hydra-cleanup)))
(catch 'hydra-disable
,@(delq nil
- (if (eq color 'blue)
+ (if (memq color '(blue teal))
`(,(when cmd `(call-interactively #',cmd))
,body-post)
`(,(when cmd
- [elpa] master 62f9b05 01/72: Allow some heads with no hints, (continued)
- [elpa] master 62f9b05 01/72: Allow some heads with no hints, Oleh Krehel, 2015/03/06
- [elpa] master f04f14c 14/72: hydra.el (defhydra): Update doc, Oleh Krehel, 2015/03/06
- [elpa] master 2086614 10/72: hydra.el (defhydradio): New macro, Oleh Krehel, 2015/03/06
- [elpa] master d04ef9b 12/72: hydra.el (hydra-cleanup): reorder, Oleh Krehel, 2015/03/06
- [elpa] master 926d9a4 15/72: Add pink body color, Oleh Krehel, 2015/03/06
- [elpa] master d25e560 03/72: Fix head color for heads with nil as HINT, Oleh Krehel, 2015/03/06
- [elpa] master abb76e8 13/72: lv.el (lv-message): Don't deactivate mark, Oleh Krehel, 2015/03/06
- [elpa] master 81ffca0 20/72: Update faces, Oleh Krehel, 2015/03/06
- [elpa] master 9769143 25/72: hydra-examples.el: Add example 7, Oleh Krehel, 2015/03/06
- [elpa] master c049a33 16/72: Allow for Ruby-style Hydra docstrings, Oleh Krehel, 2015/03/06
- [elpa] master 688e8fd 23/72: hydra.el (hydra--head-color): fix for teal color,
Oleh Krehel <=
- [elpa] master 0cda4ce 26/72: Fix typos, Oleh Krehel, 2015/03/06
- [elpa] master caf114a 11/72: Fix unintentional recursion in Emacs 25, Oleh Krehel, 2015/03/06
- [elpa] master c7281e9 17/72: Minor refactoring, Oleh Krehel, 2015/03/06
- [elpa] master 06b35f7 08/72: Remove obsoletes, Oleh Krehel, 2015/03/06
- [elpa] master 806e04b 09/72: Don't clutter Echo Area, Oleh Krehel, 2015/03/06
- [elpa] master 4f0ef62 27/72: hydra.el (hydra-pink-fallback): Add, Oleh Krehel, 2015/03/06
- [elpa] master 4aa8826 18/72: hydra.el (hydra--message): Take same arguments as `defhydra', Oleh Krehel, 2015/03/06
- [elpa] master b81d078 29/72: Generate a global resetter in `defhydradio', Oleh Krehel, 2015/03/06
- [elpa] master 42cb833 21/72: hydra.el (hydra--hint): Take same arguments as `defhydra', Oleh Krehel, 2015/03/06
- [elpa] master 0a3cc60 30/72: Add compat color-less syntax, Oleh Krehel, 2015/03/06