From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fL4k1-0002PH-8W for guix-patches@gnu.org; Tue, 22 May 2018 06:42:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fL4k0-0005w1-EE for guix-patches@gnu.org; Tue, 22 May 2018 06:42:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35786) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fL4k0-0005vx-Aa for guix-patches@gnu.org; Tue, 22 May 2018 06:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fL4k0-0004w1-3b for guix-patches@gnu.org; Tue, 22 May 2018 06:42:04 -0400 Subject: [bug#31500] [PATCH 02/20] gnu: Add emacs-evil-ediff. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fL4ja-00022P-IB for guix-patches@gnu.org; Tue, 22 May 2018 06:41:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fL4jZ-0005R8-QV for guix-patches@gnu.org; Tue, 22 May 2018 06:41:38 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:55472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fL4jZ-0005PM-KB for guix-patches@gnu.org; Tue, 22 May 2018 06:41:37 -0400 Received: by mail-wm0-x22d.google.com with SMTP id a8-v6so30514798wmg.5 for ; Tue, 22 May 2018 03:41:37 -0700 (PDT) Received: from mimimi.home (2a01cb040a37a0005adf9a0845f647b3.ipv6.abo.wanadoo.fr. [2a01:cb04:a37:a000:5adf:9a08:45f6:47b3]) by smtp.gmail.com with ESMTPSA id 67-v6sm22437230wmw.32.2018.05.22.03.41.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 03:41:35 -0700 (PDT) From: Pierre Neidhardt Date: Tue, 22 May 2018 12:41:15 +0200 Message-Id: <20180522104133.26049-2-ambrevar@gmail.com> In-Reply-To: <20180522104133.26049-1-ambrevar@gmail.com> References: <20180518184910.9987-1-ambrevar@gmail.com> <20180522104133.26049-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: 31500@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 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