[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4aa8826 18/72: hydra.el (hydra--message): Take same argume
From: |
Oleh Krehel |
Subject: |
[elpa] master 4aa8826 18/72: hydra.el (hydra--message): Take same arguments as `defhydra' |
Date: |
Fri, 06 Mar 2015 13:04:06 +0000 |
branch: master
commit 4aa8826d165925dbe25bba513fbe747ae52048ad
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (hydra--message): Take same arguments as `defhydra'
---
hydra.el | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hydra.el b/hydra.el
index 6c54902..3f547c5 100644
--- a/hydra.el
+++ b/hydra.el
@@ -323,11 +323,13 @@ The expressions can be auto-expanded according to NAME."
(error "Unrecognized key: _%s_" key))))
`(format ,str ,@(nreverse varlist))))
-(defun hydra--message (str name heads body-color)
+(defun hydra--message (name body docstring heads)
"Generate code to display STR in the preferred echo area.
Set `hydra-lv' to choose the echo area.
NAME, HEADS and BODY-COLOR are parameters of `defhydra'."
- (let ((format-expr (hydra--format (hydra--hint str heads body-color) name
heads body-color)))
+ (let* ((body-color (hydra--body-color body))
+ (format-expr (hydra--format
+ (hydra--hint docstring heads body-color) name heads
body-color)))
`(if hydra-lv
(lv-message ,format-expr)
(message ,format-expr))))
@@ -551,7 +553,7 @@ result of `defhydra'."
(error "Invalid :bind property %S" head))))))
heads names))
(defun ,hint-name ()
- ,(hydra--message docstring name heads body-color))
+ ,(hydra--message name body docstring heads))
,(hydra--make-defun body-name nil nil doc hint-name keymap
body-color body-pre body-post
'(setq prefix-arg current-prefix-arg)))))
- [elpa] master 81ffca0 20/72: Update faces, (continued)
- [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, 2015/03/06
- [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 <=
- [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
- [elpa] master 92e1922 19/72: hydra.el (hydra--hint): Take same arguments as `defhydra', Oleh Krehel, 2015/03/06
- [elpa] master 6f7cef2 22/72: Add teal body color, Oleh Krehel, 2015/03/06
- [elpa] master 7010772 32/72: hydra.el (hydra--head-color): Improve, Oleh Krehel, 2015/03/06
- [elpa] master d0e8d57 33/72: hydra.el (hydra-add-font-lock): Add `defhydradio', Oleh Krehel, 2015/03/06
- [elpa] master 0881733 28/72: hydra.el (defhydra): Fix typo, Oleh Krehel, 2015/03/06
- [elpa] master a4c4eb6 36/72: Add example for `Buffer-menu-mode', Oleh Krehel, 2015/03/06
- [elpa] master 88b32d5 24/72: hydra.el (hydra--hint): Add exception, Oleh Krehel, 2015/03/06