[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master e4cae0a 03/45: hydra.el (defhydra): Simplify :cmd-name par
From: |
Oleh Krehel |
Subject: |
[elpa] master e4cae0a 03/45: hydra.el (defhydra): Simplify :cmd-name part |
Date: |
Thu, 16 Apr 2015 12:45:39 +0000 |
branch: master
commit e4cae0a0ddca9c6928a7ff5607949adb5c743bb5
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
hydra.el (defhydra): Simplify :cmd-name part
* hydra.el (defhydra): When a plist isn't nil, `plist-put' can be used,
which is useful to overwrite :cmd-name if it's present. When plist is
nil, use the old code.
---
hydra.el | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hydra.el b/hydra.el
index f228e97..22f522c 100644
--- a/hydra.el
+++ b/hydra.el
@@ -914,10 +914,14 @@ result of `defhydra'."
(setcdr (cdr h) (cons
(hydra-plist-get-default body-plist :hint
"")
(cddr h))))
- (setcdr (cddr h)
- `(:cmd-name
- ,(hydra--head-name h name body)
- ,@(cl-cdddr h))))))))
+ (let ((hint-and-plist (cddr h)))
+ (if (null (cdr hint-and-plist))
+ (setcdr hint-and-plist
+ (list :cmd-name
+ (hydra--head-name h name body)))
+ (plist-put (cdr hint-and-plist)
+ :cmd-name
+ (hydra--head-name h name body)))))))))
(let ((doc (hydra--doc body-key body-name heads))
(heads-nodup (hydra--delete-duplicates heads)))
(mapc
- [elpa] master updated (22139ae -> f972634), Oleh Krehel, 2015/04/16
- [elpa] master cc6accd 04/45: hydra.el (hydra--digit-argument): Fix for Emacs 24.3, Oleh Krehel, 2015/04/16
- [elpa] master e4cae0a 03/45: hydra.el (defhydra): Simplify :cmd-name part,
Oleh Krehel <=
- [elpa] master c06c006 02/45: Use set/defvar for keymap, Oleh Krehel, 2015/04/16
- [elpa] master e7aaafb 07/45: hydra.el (hydra-pink-fallback): Allow prefix arguments, Oleh Krehel, 2015/04/16
- [elpa] master d0cc1c5 01/45: Define a keymap var for each hydra and re-use it, Oleh Krehel, 2015/04/16
- [elpa] master 666048c 10/45: Update testing setup, Oleh Krehel, 2015/04/16
- [elpa] master f9bf8fe 08/45: hydra.el (hydra-set-transient-map): Update, Oleh Krehel, 2015/04/16
- [elpa] master 60483cb 09/45: Add integration testing, Oleh Krehel, 2015/04/16
- [elpa] master 4dde4f7 11/45: hydra.el (hydra--format): Add some more symbols, Oleh Krehel, 2015/04/16
- [elpa] master 3fce2bd 12/45: Try to re-encode the input in the terminal, Oleh Krehel, 2015/04/16
- [elpa] master fa5643f 15/45: Quit Hydra for `handle-switch-frame', Oleh Krehel, 2015/04/16
- [elpa] master af39a98 14/45: Adapt to the new `hydra-set-transient-map', Oleh Krehel, 2015/04/16