[Emacs-diffs] emacs-24 r117198: * lisp/emacs-lisp/package.el (package-pinned-packages): Doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 117198
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-06-02 21:41:20 -0700
message:
  * lisp/emacs-lisp/package.el (package-pinned-packages): Doc fix.
  
  * etc/NEWS: Related edit.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-06-02 00:22:41 +0000
+++ b/etc/NEWS  2014-06-03 04:41:20 +0000
@@ -816,8 +816,8 @@
 
 ** Package
 
-FIXME
-*** New option `package-pinned-packages'.
+*** New option `package-pinned-packages'.  This is useful if you have multiple
+archives enabled, with more than one offering a package that you want.
 
 FIXME
 *** New options `package-check-signature' and `package-unsigned-archives'.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-02 18:58:36 +0000
+++ b/lisp/ChangeLog    2014-06-03 04:41:20 +0000
@@ -1,3 +1,7 @@
+2014-06-03  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/package.el (package-pinned-packages): Doc fix.
+
 2014-06-02  Eli Zaretskii  <address@hidden>
 
        * menu-bar.el (menu-bar-open): Fix invocation via M-x.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-05-30 05:15:29 +0000
+++ b/lisp/emacs-lisp/package.el        2014-06-03 04:41:20 +0000
@@ -229,18 +229,25 @@
   :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")