* lisp/emacs-lisp/package.el (package-archives): Add NonGNU ELPA

diff --git a/etc/NEWS b/etc/NEWS
index 4f072df31c5e8a489cac641cccd87ad55a81451e..328c666da34caacb372b0ea083866324dab26c67 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -85,6 +85,8 @@ useful on systems such as FreeBSD which ships only with "etc/termcap".
 \f
 * Changes in Emacs 28.1
 
+** The new NonGNU ELPA archive is enabled by default alongside GNU ELPA
+
 ** Minibuffer scrolling is now conservative by default.
 This is controlled by the new variable 'scroll-minibuffer-conservatively'.
 

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index bc450b09d015739db4ccee1a04f0fe562f4d2803..8f77f66af11c5607cb438e1a48a5f8088ff8b469 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -203,6 +203,9 @@ If VERSION is nil, the package is not made available (it is \"disabled\")."
 
 (defcustom package-archives `(("gnu" .
                                ,(format "http%s://elpa.gnu.org/packages/"
+                                        (if (gnutls-available-p) "s" "")))
+                              ("nongnu" .
+                               ,(format "http%s://elpa.nongnu.org/nongnu/"
                                         (if (gnutls-available-p) "s" ""))))
   "An alist of archives from which to fetch.
 The default value points to the GNU Emacs package repository.