diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-01-02 10:11:15 +0100 |
| commit | 5db5064395c251a822e429e19ddecb74a974b6ef (patch) | |
| tree | 2e04729a03d5fc68d0caef3a16e00349b6d413fc /lisp/emacs-lisp/package.el | |
| parent | 9420ea6e0840bffcb140d3677dfdabb9251c1f63 (diff) | |
| parent | 0f561ee55348ff451600cc6027db5940ee14606f (diff) | |
| download | emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.gz emacs-5db5064395c251a822e429e19ddecb74a974b6ef.tar.bz2 emacs-5db5064395c251a822e429e19ddecb74a974b6ef.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 656e5ce36bf..5e9c328459c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1,6 +1,6 @@ ;;; package.el --- Simple package system for Emacs -*- lexical-binding:t -*- -;; Copyright (C) 2007-2020 Free Software Foundation, Inc. +;; Copyright (C) 2007-2021 Free Software Foundation, Inc. ;; Author: Tom Tromey <tromey@redhat.com> ;; Daniel Hackney <dan@haxney.org> @@ -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. |