Rebind ivy-occur to "C-c C-o" and "C-o u"

* ivy.el (ivy-minibuffer-map): Update.

* ivy-hydra.el (hydra-ivy): Update.

Wouldn't want to violate the "C-c LETTER" convention.

diff --git a/ivy-hydra.el b/ivy-hydra.el
index 19deabb47393be7904a2d2eb896c0ee00eb2dd6d..63755da7cbf4c0a2be176b5dce13d38e95edaf59 100644 (file)
--- a/ivy-hydra.el
+++ b/ivy-hydra.el
@@ -53,11 +53,11 @@
 (defhydra hydra-ivy (:hint nil
                      :color pink)
   "
-^^^^^^          ^Yes^     ^No^     ^Maybe^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Action^               ^
-^^^^^^^^^^^^^^----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------------
-^ ^ _k_ ^ ^     _f_ollow  _i_nsert _c_: calling %-5s(if ivy-calling \"on\" \"off\") _w_/_s_/_a_: %-14s(ivy-action-name)
-_h_ ^+^ _l_     _d_one    _o_ops   _m_: matcher %-5s(ivy--matcher-desc)^^^^^^^^^^^^ _C_ase-fold: %-10`ivy-case-fold-search
-^ ^ _j_ ^ ^     _g_o      ^ ^      _<_/_>_: shrink/grow^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _t_runcate: %-11`truncate-lines
+^^^^^^          ^Yes^    ^^      ^No^     ^Maybe^            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Action^               ^
+^^^^^^^^^^^^^^^----------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------------
+^ ^ _k_ ^ ^     _f_ollow occ_u_r _i_nsert _c_: calling %-5s(if ivy-calling \"on\" \"off\") _w_/_s_/_a_: %-14s(ivy-action-name)
+_h_ ^+^ _l_     _d_one      ^ ^  _o_ops   _m_: matcher %-5s(ivy--matcher-desc)^^^^^^^^^^^^ _C_ase-fold: %-10`ivy-case-fold-search
+^ ^ _j_ ^ ^     _g_o        ^ ^  ^ ^      _<_/_>_: shrink/grow^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _t_runcate: %-11`truncate-lines
 "
   ;; arrows
   ("h" ivy-beginning-of-buffer)
@@ -82,7 +82,8 @@ _h_ ^+^ _l_     _d_one    _o_ops   _m_: matcher %-5s(ivy--matcher-desc)^^^^^^^^^
   ("s" ivy-next-action)
   ("a" ivy-read-action)
   ("t" (setq truncate-lines (not truncate-lines)))
-  ("C" ivy-toggle-case-fold))
+  ("C" ivy-toggle-case-fold)
+  ("u" ivy-occur :exit t))
 
 (provide 'ivy-hydra)
 

diff --git a/ivy.el b/ivy.el
index f5dbd9411bd243149fc654a0d6b72a570a3b4f79..73d2f8ace12741cf435cc27b1dcb081901915a60 100644 (file)
--- a/ivy.el
+++ b/ivy.el
@@ -171,7 +171,7 @@ Only \"./\" and \"../\" apply here. They appear in reverse order."
     (define-key map (kbd "M-w") 'ivy-kill-ring-save)
     (define-key map (kbd "C-'") 'ivy-avy)
     (define-key map (kbd "C-M-a") 'ivy-read-action)
-    (define-key map (kbd "C-c o") 'ivy-occur)
+    (define-key map (kbd "C-c C-o") 'ivy-occur)
     map)
   "Keymap used in the minibuffer.")
 (autoload 'hydra-ivy/body "ivy-hydra" "" t)