[bug#31500] [PATCH 02/20] gnu: Add emacs-evil-ediff.

[Pierre Neidhardt]

* gnu/packages/emacs.scm (emacs-evil-ediff): New variable.
---
 gnu/packages/emacs.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index db4ff5652..c972c5dcd 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10518,3 +10518,27 @@ Unless you're using @code{use-package}'s hook keyword, 
you can enable the
 autosuggestions with:
 @code{(add-hook 'eshell-mode-hook #'esh-autosuggest-mode)}")
     (license license:gpl3+)))
+
+(define-public emacs-evil-ediff
+  (package
+    (name "emacs-evil-ediff")
+    (version "20170724.1223")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://melpa.org/packages/evil-ediff-";
+             version
+             ".el"))
+       (sha256
+        (base32
+         "1sinr8r8iiimacr2szpz8ln32ngjar7ix8pvaiiz05i8g2xy7d57"))))
+    (build-system emacs-build-system)
+    (propagated-inputs `(("emacs-evil" ,emacs-evil)))
+    (home-page "https://github.com/emacs-evil/evil-ediff";)
+    (synopsis "Make ediff a little evil")
+    (description
+     "Make ediff a little evil.  This configures ediff to be friendlier to
+users of vim-like keybindings.  Consult the help buffer for more
+information.")
+    (license license:gpl3+)))
-- 
2.17.0