diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-02 21:41:20 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-02 21:41:20 -0700 |
| commit | 910dc8d31264e2105e876c686206521c5dc47c64 (patch) | |
| tree | 39d462f102b0215f049073105ad67e6985198b41 /lisp | |
| parent | 335908691102a2aad107ce00046ee98e80509ff1 (diff) | |
* lisp/emacs-lisp/package.el (package-pinned-packages): Doc fix.
* etc/NEWS: Related edit.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 27 |
2 files changed, 21 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d4c8d91450..bc9703db3e0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-06-03 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/package.el (package-pinned-packages): Doc fix. + 2014-06-02 Eli Zaretskii <eliz@gnu.org> * menu-bar.el (menu-bar-open): Fix invocation via M-x. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 8c275c68884..028c57da19c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -229,18 +229,25 @@ a package can run arbitrary code." :version "24.1") (defcustom package-pinned-packages nil - "An alist of packages that are pinned to a specific archive - -Each element has the form (SYM . ID). - SYM is a package, as a symbol. - ID is an archive name. This should correspond to an - entry in `package-archives'. - -If the archive of name ID does not contain the package SYM, no -other location will be considered, which will make the -package unavailable." + "An alist of packages that are pinned to specific archives. +This can be useful if you have multiple package archives enabled, +and want to control which archive a given package gets installed from. + +Each element of the alist has the form (PACKAGE . ARCHIVE), where: + PACKAGE is a symbol representing a package + ARCHIVE is a string representing an archive (it should be the car of +an element in `package-archives', e.g. \"gnu\"). + +Adding an entry to this variable means that only ARCHIVE will be +considered as a source for PACKAGE. If other archives provide PACKAGE, +they are ignored (for this package). If ARCHIVE does not contain PACKAGE, +the package will be unavailable." :type '(alist :key-type (symbol :tag "Package") :value-type (string :tag "Archive name")) + ;; I don't really see why this is risky... + ;; I suppose it could prevent you receiving updates for a package, + ;; via an entry (PACKAGE . NON-EXISTING). Which could be an issue + ;; if PACKAGE has a known vulnerability that is fixed in newer versions. :risky t :group 'package :version "24.4") |