]> code.delx.au - gnu-emacs-elpa/commitdiff
ivy-hydra.el: Add featurep for hydra
authorOleh Krehel <ohwoeowho@gmail.com>
Tue, 21 Jul 2015 16:27:33 +0000 (18:27 +0200)
committerOleh Krehel <ohwoeowho@gmail.com>
Tue, 21 Jul 2015 16:27:33 +0000 (18:27 +0200)
Fixes #174

ivy-hydra.el

index cdaff1fbc34e506c00ff44bdceb956f416b24bee..6ab1f9aebe79a8cf0daa0e702d251fea01d3da15 100644 (file)
@@ -30,7 +30,7 @@
 (require 'ivy)
 
 (eval-when-compile
-  (unless (package-installed-p 'hydra)
+  (unless (or (featurep 'hydra) (package-installed-p 'hydra))
     (defmacro defhydra (name &rest _)
       "This is a stub for the uninstalled `hydra' package."
       `(defun ,(intern (format "%S/body" name)) ()
@@ -47,7 +47,7 @@
 (defhydra hydra-ivy (:hint nil
                      :color pink)
   "
-^^^^^^          ^Yes^     ^No^     ^Maybe^           ^Action^ 
+^^^^^^          ^Yes^     ^No^     ^Maybe^           ^Action^
 ^^^^^^^^^^^^^^---------------------------------------------------
 ^ ^ _k_ ^ ^     _f_ollow  _i_nsert _c_: calling %s(if ivy-calling \"on\" \"off\")  _w_/_s_: %s(ivy-action-name)
 _h_ ^+^ _l_     _d_one    _o_ops   _m_: matcher %s(if (eq ivy--regex-function 'ivy--regex-fuzzy) \"fuzzy\" \"ivy\")