aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-12-06 00:31:42 -0800
committerGlenn Morris2011-12-06 00:31:42 -0800
commit5580f89da876cdc9cd47f036834172073ee00b95 (patch)
tree9155fcdaa3447d6a3da3162ead7afd3e1c7a0aaa
parent2bf2618007dd1f5038ae741a693c3924aee86e78 (diff)
downloademacs-5580f89da876cdc9cd47f036834172073ee00b95.tar.gz
emacs-5580f89da876cdc9cd47f036834172073ee00b95.zip
* lisp/emacs-lisp/package.el (package-archives): Doc fix re riskiness.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/package.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c222302cc9d..894a66b2cab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-12-06 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/package.el (package-archives): Doc fix re riskiness.
4
12011-12-06 Chong Yidong <cyd@gnu.org> 52011-12-06 Chong Yidong <cyd@gnu.org>
2 6
3 * progmodes/cc-fonts.el (c-annotation-face): Use defface. 7 * progmodes/cc-fonts.el (c-annotation-face): Use defface.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 8417aa8d380..a1513039a98 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -113,6 +113,8 @@
113 113
114;;; ToDo: 114;;; ToDo:
115 115
116;; - a trust mechanism, since compiling a package can run arbitrary code.
117;; For example, download package signatures and check that they match.
116;; - putting info dirs at the start of the info path means 118;; - putting info dirs at the start of the info path means
117;; users see a weird ordering of categories. OTOH we want to 119;; users see a weird ordering of categories. OTOH we want to
118;; override later entries. maybe emacs needs to enforce 120;; override later entries. maybe emacs needs to enforce
@@ -224,7 +226,10 @@ Each element has the form (ID . LOCATION).
224 LOCATION specifies the base location for the archive. 226 LOCATION specifies the base location for the archive.
225 If it starts with \"http:\", it is treated as a HTTP URL; 227 If it starts with \"http:\", it is treated as a HTTP URL;
226 otherwise it should be an absolute directory name. 228 otherwise it should be an absolute directory name.
227 (Other types of URL are currently not supported.)" 229 (Other types of URL are currently not supported.)
230
231Only add locations that you trust, since fetching and installing
232a package can run arbitrary code."
228 :type '(alist :key-type (string :tag "Archive name") 233 :type '(alist :key-type (string :tag "Archive name")
229 :value-type (string :tag "URL or directory name")) 234 :value-type (string :tag "URL or directory name"))
230 :risky t 235 :risky t