summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-09-16 15:53:19 +0200
committerAlan Pearce2019-09-16 15:53:19 +0200
commitb233e9bc5e1e8df16066650e8962347703d3b0f6 (patch)
treefec795109928777f22154fb4ee1508ede7fc963f
parentf6f4b93d53a16f5bdbf9cf53d3410688c58bd510 (diff)
downloaddotfiles-b233e9bc5e1e8df16066650e8962347703d3b0f6.tar.xz
dotfiles-b233e9bc5e1e8df16066650e8962347703d3b0f6.zip
Emacs: add smerge hydra
-rw-r--r--emacs/.emacs.d/main.el40
1 files changed, 40 insertions, 0 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index f08c83b..e13a81d 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el
@@ -173,6 +173,46 @@ With two prefix arguments, write out the day and month name."
173 (ivy-mode +1))) 173 (ivy-mode +1)))
174(use-package ivy-hydra) 174(use-package ivy-hydra)
175 175
176(use-package smerge-mode
177 :after hydra
178 :config
179 (defhydra unpackaged/smerge-hydra
180 (:color pink :hint nil :post (smerge-auto-leave))
181 "
182^Move^ ^Keep^ ^Diff^ ^Other^
183^^-----------^^-------------------^^---------------------^^-------
184_n_ext _b_ase _<_: upper/base _C_ombine
185_p_rev _u_pper _=_: upper/lower _r_esolve
186^^ _l_ower _>_: base/lower _k_ill current
187^^ _a_ll _R_efine
188^^ _RET_: current _E_diff
189"
190 ("n" smerge-next)
191 ("p" smerge-prev)
192 ("b" smerge-keep-base)
193 ("u" smerge-keep-upper)
194 ("l" smerge-keep-lower)
195 ("a" smerge-keep-all)
196 ("RET" smerge-keep-current)
197 ("\C-m" smerge-keep-current)
198 ("<" smerge-diff-base-upper)
199 ("=" smerge-diff-upper-lower)
200 (">" smerge-diff-base-lower)
201 ("R" smerge-refine)
202 ("E" smerge-ediff)
203 ("C" smerge-combine-with-next)
204 ("r" smerge-resolve)
205 ("k" smerge-kill-current)
206 ("w" (lambda ()
207 (interactive)
208 (save-buffer)
209 (bury-buffer))
210 "Save and bury buffer" :color blue)
211 ("q" nil "cancel" :color blue))
212 :hook (magit-diff-visit-file . (lambda ()
213 (when smerge-mode
214 (unpackaged/smerge-hydra/body)))))
215
176(use-package swiper 216(use-package swiper
177 :general ([remap isearch-forward] #'swiper-isearch)) 217 :general ([remap isearch-forward] #'swiper-isearch))
178 218