diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-01-03 16:33:29 +0900 |
| commit | 44f7f57c6833149799539c5e0abcadf4d7d61d43 (patch) | |
| tree | b9bbe6e261c80333dfacb62f7288cc9b37bbf588 /lisp/emacs-lisp/package.el | |
| parent | 0af4e7587e1b5ac9066e17b875952cb5a16e63c0 (diff) | |
| parent | 825b4ec338e82869dc656c7041ab2483b6c22479 (diff) | |
| download | emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.gz emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.tar.bz2 emacs-44f7f57c6833149799539c5e0abcadf4d7d61d43.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
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 bc450b09d01..40ba1355513 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. |