diff options
| author | Amin Bandali <bandali@gnu.org> | 2019-05-12 00:46:23 -0400 |
|---|---|---|
| committer | Amin Bandali <bandali@gnu.org> | 2019-05-12 00:46:23 -0400 |
| commit | b1a5d811d97e0faf409f4f6207f1d8e4502c0622 (patch) | |
| tree | 7b7908297b5f159967fc03ee62312a44cea4cc36 /.emacs.d/init.el | |
| parent | 435306f68d07a5e26da738b65d0dad57e62456c0 (diff) | |
| download | configs-b1a5d811d97e0faf409f4f6207f1d8e4502c0622.tar.gz configs-b1a5d811d97e0faf409f4f6207f1d8e4502c0622.tar.xz configs-b1a5d811d97e0faf409f4f6207f1d8e4502c0622.zip | |
emacs: add vc-ediff binding, winner-undo on ediff quit, horiz split
Diffstat (limited to '')
| -rw-r--r-- | .emacs.d/init.el | 8 |
1 files changed, 8 insertions, 0 deletions
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 |