From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 27 Dec 2020 22:31:07 +0000 (-0500)
Subject: * lisp/emacs-lisp/package.el (package-archives): Add NonGNU ELPA
X-Git-Tag: emacs-28.0.90~4541
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d5a6c9ef5272b2a98c2faa0a9308ab69f011570;p=emacs.git

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

diff --git a/etc/NEWS b/etc/NEWS
index 4f072df31c5..328c666da34 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -85,6 +85,8 @@ useful on systems such as FreeBSD which ships only with "etc/termcap".
 
 * 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 bc450b09d01..8f77f66af11 100644
--- 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.