aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/emacs.scm
diff options
context:
space:
mode:
authorPierre Neidhardt <ambrevar@gmail.com>2018-06-01 09:44:06 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-02 16:02:51 +0200
commit22deb0343925e639269a50fabcfc53fc0f49f02e (patch)
tree65eb1f13fc2df3c635d29f3b8637082f142df696 /gnu/packages/emacs.scm
parent8292f5a9c5232e8a77d80f4cd33afaeac7a60d79 (diff)
downloadguix-22deb0343925e639269a50fabcfc53fc0f49f02e.tar
guix-22deb0343925e639269a50fabcfc53fc0f49f02e.tar.gz
gnu: Add emacs-evil-ediff.
* gnu/packages/emacs.scm (emacs-evil-ediff): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r--gnu/packages/emacs.scm23
1 files changed, 23 insertions, 0 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7694d2410b..6b1de48e7a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10614,3 +10614,26 @@ This code is still alpha.")
and the Zotero research assistant: Insertion of links to Zotero items into an
Org-mode file, and citations of Zotero items in Pandoc Markdown files.")
(license license:gpl3+)))
+
+(define-public emacs-evil-ediff
+ (package
+ (name "emacs-evil-ediff")
+ (version "20170724")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/emacs-evil/evil-ediff/archive/"
+ "67b0e69f65c196eff5b39dacb7a9ec05bb919c74"
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0j2x26zfc6md54mjf76qpybil4yal70lp5bifcz62l1f8fc1vvlq"))))
+ (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
+ "This Emacs package configures Ediff to be friendlier to users of Vi-like
+keybindings. Consult the help buffer for more information.")
+ (license license:gpl3+)))