all repos — nixfiles @ 7af9f474a725c084931594ca52c775ec060daf81

System and user configuration, managed by nix and home-manager

Setup ediff configuration
Alan Pearce alan@alanpearce.co.uk
Sat, 17 Aug 2013 15:22:37 +0100
commit

7af9f474a725c084931594ca52c775ec060daf81

parent

4eb69405683c90659e7f2a9c3a2fd947dd027ed0

1 files changed, 6 insertions(+), 0 deletions(-)

jump to
M emacs/init.elemacs/init.el
@@ -427,6 +427,12 @@ :config (progn             (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