diff --git a/.emacs.d/init-hydra.el b/.emacs.d/init-hydra.el index 6d21e35..78c78b5 100644 --- a/.emacs.d/init-hydra.el +++ b/.emacs.d/init-hydra.el @@ -15,7 +15,7 @@ ("p" previous-buffer) ("n" next-buffer) - ("b" ido-switch-buffer) + ("b" ido-switch-buffer) ("f" ido-find-file) ("x" split-window-below) @@ -86,9 +86,8 @@ word: _w_: 1 char _W_: 0 char" ("W" avy-goto-word-0) ("q" nil)) -(defhydra hydra-smerge - (:color pink :hint nil :post (smerge-auto-leave)) - " +(defhydra hydra-smerge (:hint nil :color pink :post (smerge-auto-leave)) + " ^Move^ ^Keep^ ^Diff^ ^Other^ ^^-----------^^-------------------^^---------------------^^------- _n_ext _b_ase _<_: upper/base _C_ombine @@ -97,20 +96,20 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ^^ _a_ll _R_efine ^^ _RET_: current _E_diff _q_: cancel " - ("n" smerge-next) - ("p" smerge-prev) - ("b" smerge-keep-base) - ("u" smerge-keep-upper) - ("l" smerge-keep-lower) - ("a" smerge-keep-all) - ("RET" smerge-keep-current) - ("\C-m" smerge-keep-current) - ("<" smerge-diff-base-upper) - ("=" smerge-diff-upper-lower) - (">" smerge-diff-base-lower) - ("R" smerge-refine) - ("E" smerge-ediff) - ("C" smerge-combine-with-next) - ("r" smerge-resolve) - ("k" smerge-kill-current) - ("q" nil :color blue)) + ("n" smerge-next) + ("p" smerge-prev) + ("b" smerge-keep-base) + ("u" smerge-keep-upper) + ("l" smerge-keep-lower) + ("a" smerge-keep-all) + ("RET" smerge-keep-current) + ("\C-m" smerge-keep-current) + ("<" smerge-diff-base-upper) + ("=" smerge-diff-upper-lower) + (">" smerge-diff-base-lower) + ("R" smerge-refine) + ("E" smerge-ediff) + ("C" smerge-combine-with-next) + ("r" smerge-resolve) + ("k" smerge-kill-current) + ("q" nil :color blue))