From 7dbdd5051a9fff8141ea7abb79d1461a82c56d64 Mon Sep 17 00:00:00 2001
From: Michael Hauser-Raspe <hauserra@amazon.com>
Date: Mon, 9 Mar 2015 16:50:41 +0000
Subject: [PATCH] Add basic ediff layer

---
 contrib/ediff/README.md   | 23 +++++++++++++++++++++++
 contrib/ediff/packages.el | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 contrib/ediff/README.md
 create mode 100644 contrib/ediff/packages.el

diff --git a/contrib/ediff/README.md b/contrib/ediff/README.md
new file mode 100644
index 000000000..ff17a4cbe
--- /dev/null
+++ b/contrib/ediff/README.md
@@ -0,0 +1,23 @@
+# Ediff Mode
+
+This contribution layer adds some support for ediff-mode into spacemacs
+
+## Key Bindings
+
+## TODO:
+We currently just set a few variables to make it look nicer.
+Here is my first attempt at evilifying the buffer, does not work correctly, help is very much welcome.
+
+```
+(defun ediff/setup-ediff-keymaps ()
+  "setup the evil ediff keymap"
+    (progn
+     (add-to-list 'evil-emacs-state-modes 'Ediff)
+     (spacemacs|evilify ediff-mode-map)
+     (spacemacs/activate-evil-leader-for-map 'ediff-mode-map)
+      )
+  )
+
+;; inside the use-package function
+(add-hook 'ediff-keymap-setup-hook 'ediff/setup-ediff-keymaps)
+```
diff --git a/contrib/ediff/packages.el b/contrib/ediff/packages.el
new file mode 100644
index 000000000..235b50fcd
--- /dev/null
+++ b/contrib/ediff/packages.el
@@ -0,0 +1,35 @@
+;;; packages.el --- ediff Layer packages File for Spacemacs
+;;
+;; Copyright (c) 2012-2014 Sylvain Benner
+;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
+;;
+;; Author: Sylvain Benner <sylvain.benner@gmail.com>
+;; URL: https://github.com/syl20bnr/spacemacs
+;;
+;; This file is not part of GNU Emacs.
+;;
+;;; License: GPLv3
+
+(defvar ediff-packages
+  '(
+    ediff
+    )
+  "List of all packages to install and/or initialize. Built-in packages
+which require an initialization must be listed explicitly in the list.")
+
+
+(defun ediff/init-ediff ()
+  "Initialize my package"
+  (use-package ediff
+    :defer t
+    :init
+    (progn
+      ;; first we set some sane defaults
+      (setq-default
+       ediff-window-setup-function 'ediff-setup-windows-plain
+       ;; emacs is evil and decrees that vertical shall henceforth be horizontal
+       ediff-split-window-function 'split-window-horizontally
+       ediff-merge-split-window-function 'split-window-horizontally)
+      )
+    )
+  )