emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master a72d68a 28/36: hydra.el (hydra-fontify-head-default): Fix


From: Oleh Krehel
Subject: [elpa] master a72d68a 28/36: hydra.el (hydra-fontify-head-default): Fix head keys as "%f"
Date: Sat, 22 Jul 2017 11:22:25 -0400 (EDT)

branch: master
commit a72d68a0f6492af6201fbdb88211cb2f7488f3be
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    hydra.el (hydra-fontify-head-default): Fix head keys as "%f"
    
    Fixes #223
    
    For example, this should work now:
    
        (defhydra hydra-test ()
          "test"
          ("%f" forward-char))
---
 hydra.el | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/hydra.el b/hydra.el
index 61fb01c..eaedd6c 100644
--- a/hydra.el
+++ b/hydra.el
@@ -555,18 +555,17 @@ HEAD's binding is returned as a string with a colored 
face."
     (when (and (null (cadr head))
                (not head-exit))
       (hydra--complain "nil cmd can only be blue"))
-    (propertize (if (string= (car head) "%")
-                    "%%"
-                  (car head))
-                'face
-                (or (hydra--head-property head :face)
-                    (cl-case head-color
-                      (blue 'hydra-face-blue)
-                      (red 'hydra-face-red)
-                      (amaranth 'hydra-face-amaranth)
-                      (pink 'hydra-face-pink)
-                      (teal 'hydra-face-teal)
-                      (t (error "Unknown color for %S" head)))))))
+    (propertize
+     (replace-regexp-in-string "%" "%%" (car head))
+     'face
+     (or (hydra--head-property head :face)
+         (cl-case head-color
+           (blue 'hydra-face-blue)
+           (red 'hydra-face-red)
+           (amaranth 'hydra-face-amaranth)
+           (pink 'hydra-face-pink)
+           (teal 'hydra-face-teal)
+           (t (error "Unknown color for %S" head)))))))
 
 (defun hydra-fontify-head-greyscale (head _body)
   "Produce a pretty string from HEAD and BODY.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]