From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOekD-00080G-32 for guix-patches@gnu.org; Fri, 01 Jun 2018 03:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOekA-0003tR-0Y for guix-patches@gnu.org; Fri, 01 Jun 2018 03:45:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48738) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOek9-0003tH-Ri for guix-patches@gnu.org; Fri, 01 Jun 2018 03:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fOek9-0004Q7-I1 for guix-patches@gnu.org; Fri, 01 Jun 2018 03:45:01 -0400 Subject: [bug#31509] [PATCH 03/21] gnu: Add emacs-evil-ediff. References: <20180518184910.9987-11-ambrevar@gmail.com> In-Reply-To: <20180518184910.9987-11-ambrevar@gmail.com> Resent-Message-ID: From: Pierre Neidhardt Date: Fri, 1 Jun 2018 09:44:06 +0200 Message-Id: <20180601074406.25080-1-ambrevar@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31509@debbugs.gnu.org * 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 90b7fb2ca..0c2081c90 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10600,3 +10600,27 @@ 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 + "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