From b1a5d811d97e0faf409f4f6207f1d8e4502c0622 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 12 May 2019 00:46:23 -0400 Subject: emacs: add vc-ediff binding, winner-undo on ediff quit, horiz split --- .emacs.d/init.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index fe4b180..8d93b33 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -444,6 +444,14 @@ For disabling the behaviour for certain buffers and/or modes." ;; allow scrolling in Isearch (setq isearch-allow-scroll t) +(use-feature vc + :bind ("C-x v C-=" . vc-ediff)) + +(use-feature ediff + :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo) + :custom ((ediff-window-setup-function 'ediff-setup-windows-plain) + (ediff-split-window-function 'split-window-horizontally))) + ;;; General bindings -- cgit v1.2.3-60-g2f50