Last active
February 19, 2019 08:23
-
-
Save holgerschurig/10492ac848679b7f05e5859b0c77b19f to your computer and use it in GitHub Desktop.
sample ediff setup
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(use-package ediff | |
:commands (ediff-setup-keymap) | |
:config | |
(setq ediff-window-setup-function 'ediff-setup-windows-plain) | |
(setq ediff-split-window-function 'split-window-horizontally) | |
(setq ediff-diff-options "-w") | |
(defun my--ediff-hook () | |
(ediff-setup-keymap) | |
(bind-key "j" 'ediff-next-difference ediff-mode-map) | |
(bind-key "k" 'ediff-previous-difference ediff-mode-map)) | |
(add-hook 'ediff-mode-hook 'my--ediff-hook) | |
(add-hook 'ediff-after-quit-hook-internal 'winner-undo)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment