branch: elpa/evil
commit 599f79b3ab454bf809a19e48309d911a35e29e46
Author: Vasilij Schneidermann <m...@vasilij.de>
Commit: Vasilij Schneidermann <m...@vasilij.de>
Mention NonGNU ELPA
---
.github/ISSUE_TEMPLATE.md | 2 +-
README.md | 11 +++++++----
doc/source/overview.rst | 20 +++++++++++++++-----
evil.el | 9 ++++++++-
scripts/evilupdate | 7 ++++---
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index a96e0b6..53cbe14 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -12,7 +12,7 @@
Emacs version: <!-- M-x emacs-version -->
Operating System: <!-- Name and version, e.g. Windows 10, macOS Sierra, Debian
Jessie -->
Evil version: <!-- M-x evil-version -->
-Evil installation type: <!-- MELPA, MELPA stable, Quelpa, El-Get, manual -->
+Evil installation type: <!-- MELPA, MELPA stable, NonGNU ELPA, Quelpa, El-Get,
manual -->
Graphical/Terminal: <!-- Whether you're running Emacs in a terminal emulator
or under X -->
Tested in a `make emacs` session (see
[CONTRIBUTING.md](https://github.com/emacs-evil/evil/blob/master/CONTRIBUTING.md#bug-reports)):
<!-- Yes / No -->
diff --git a/README.md b/README.md
index 2b768cc..7d33d67 100644
--- a/README.md
+++ b/README.md
@@ -43,12 +43,15 @@ file.
* Evil requires any of the following for `C-r`:
* `undo-redo` from Emacs 28
- * The [undo-tree](http://www.emacswiki.org/emacs/UndoTree) package
+ * The [undo-tree](https://gitlab.com/tsc25/undo-tree) package
+ (available via GNU ELPA)
* The [undo-fu](https://gitlab.com/ideasman42/emacs-undo-fu) package
+ (available via MELPA)
-* For the motions `g;` `g,` and for the last-change-register `.`, Evil
requires the
-[goto-chg.el](https://github.com/emacs-evil/goto-chg) package,
-which provides the functions `goto-last-change` and `goto-last-change-reverse`.
+* For the motions `g;` `g,` and for the last-change-register `.`, Evil
+ requires the [goto-chg.el](https://github.com/emacs-evil/goto-chg)
+ package (available via MELPA and NonGNU ELPA), which provides the
+ functions `goto-last-change` and `goto-last-change-reverse`.
* For Emacs 24.1 and 24.2 Evil also requires
[cl-lib](https://elpa.gnu.org/packages/cl-lib.html).
diff --git a/doc/source/overview.rst b/doc/source/overview.rst
index 467c9ef..af91534 100644
--- a/doc/source/overview.rst
+++ b/doc/source/overview.rst
@@ -9,12 +9,22 @@ general, Evil is extensible in Emacs Lisp.
Installation via package.el
---------------------------
-Evil is available as a package from MELPA stable and MELPA unstable.
-This is the recommended way of installing Evil.
+Evil is available as a package from MELPA stable, MELPA unstable and
+NonGNU ELPA. This is the recommended way of installing Evil.
-To set up `package.el` to work with one of these repositories, you can
-follow the instructions on
-`melpa.org <https://melpa.org/#/getting-started>`_.
+To set up `package.el` to work with one of the MELPA repositories, you
+can follow the instructions on `melpa.org
+<https://melpa.org/#/getting-started>`_.
+
+Alternatively you can use NonGNU ELPA. It is part of the default
+package archives as of Emacs 28. For older Emacs versions you'll need
+to add it yourself:
+
+.. code-block:: elisp
+
+ (add-to-list 'package-archives
+ (cons "nongnu" (format "http%s://elpa.nongnu.org/nongnu/"
+ (if (gnutls-available-p) "s" ""))))
Once that is done, you can execute the following commands::
diff --git a/evil.el b/evil.el
index e584b31..b329c2e 100644
--- a/evil.el
+++ b/evil.el
@@ -110,12 +110,19 @@
;; Evil requires undo-redo (Emacs 28), undo-fu or undo-tree for redo
;; functionality. Otherwise, Evil uses regular Emacs undo.
;;
+;; https://gitlab.com/ideasman42/emacs-undo-fu
+;; https://melpa.org/#/undo-fu
+;; https://gitlab.com/tsc25/undo-tree
+;; https://elpa.gnu.org/packages/undo-tree.html
+;;
;; Evil requires `goto-last-change' and `goto-last-change-reverse'
;; function for the corresponding motions g; g, as well as the
;; last-change-register `.'. One package providing these functions is
;; goto-chg.el:
;;
-;; http://www.emacswiki.org/emacs/GotoChg
+;; https://github.com/emacs-evil/goto-chg
+;; https://melpa.org/#/goto-chg
+;; https://elpa.nongnu.org/nongnu/goto-chg.html
;;
;; Without this package the corresponding motions will raise an error.
diff --git a/scripts/evilupdate b/scripts/evilupdate
index 96f6540..27e832b 100755
--- a/scripts/evilupdate
+++ b/scripts/evilupdate
@@ -142,13 +142,14 @@ match group."
(shell-command (concat "thunderbird -compose
\"newsgroups=gmane.emacs.vim-emulation,preselectid=id2,subject='[ANN] Evil
version " evilupdate-version " released',body='"
"Evil version " evilupdate-version " has been
released.
-The stable version can be installed from MELPA stable [1].
-The latest development version is available from MELPA [2].
+The stable version can be installed from MELPA stable [1] and NonGNU ELPA [2].
+The latest development version is available from MELPA [3].
The Evil developers.
[1] http://stable.melpa.org
-[2] http://melpa.org
+[2] https://elpa.nongnu.org/nongnu/evil.html
+[3] http://melpa.org
'\"")))
(defun evilupdate-update (version nonews)
