diff options
| author | Alan Pearce | 2013-08-17 15:22:37 +0100 |
|---|---|---|
| committer | Alan Pearce | 2013-08-17 15:22:37 +0100 |
| commit | 7af9f474a725c084931594ca52c775ec060daf81 (patch) | |
| tree | f9fddd6b98892ae5520cb4b285bd92f39d3c76b9 /emacs | |
| parent | 4eb69405683c90659e7f2a9c3a2fd947dd027ed0 (diff) | |
| download | nixfiles-7af9f474a725c084931594ca52c775ec060daf81.tar.lz nixfiles-7af9f474a725c084931594ca52c775ec060daf81.tar.zst nixfiles-7af9f474a725c084931594ca52c775ec060daf81.zip | |
Setup ediff configuration
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/init.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/emacs/init.el b/emacs/init.el index 0f05bc0c..d142da47 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -427,6 +427,12 @@ Values: `desktop', `server', `laptop'") (add-to-list 'tramp-remote-path "/usr/local/sbin") (add-to-list 'tramp-remote-path "~/bin"))) +(use-package ediff + :defer t + :config (progn + (setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain))) + ;;;; Indentation (setq-default tab-width 4 |