summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Neidhardt <ambrevar@gmail.com>2018-06-17 11:09:40 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-20 23:47:08 +0200
commit1e5fb529d193164f14ab9f543b0e2a84229a8849 (patch)
tree136b35fee59eab15eb963f61595c086d6a2f1098
parent9abf135b202a3c6c91c0bb67aa6ac53a6e37b15f (diff)
downloadpatches-1e5fb529d193164f14ab9f543b0e2a84229a8849.tar
patches-1e5fb529d193164f14ab9f543b0e2a84229a8849.tar.gz
gnu: emacs-evil-ediff: Deprecate in favor of emacs-evil-collection.
* gnu/packages/emacs.scm (emacs-evil-ediff): Deprecate. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/emacs.scm23
1 files changed, 2 insertions, 21 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 7fef631ba4..dc4802cbad 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10701,27 +10701,8 @@ 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+)))
+ ;; Evil-Ediff is included in Evil Collection from 20180617.
+ (deprecated-package "emacs-evil-ediff" emacs-evil-collection))
(define-public emacs-evil-magit
(let ((commit "dbf5a646a7ce1c35c229dfdc423bd5ecd927a3a8"))