aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/package.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 018c6dfc2c4..6958b2f0414 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-01-16 Jorgen Schaefer <contact@jorgenschaefer.de>
2
3 * emacs-lisp/package.el (package-archive-priorities): Specify
4 correct type.
5
12015-01-17 Ulrich Müller <ulm@gentoo.org> 62015-01-17 Ulrich Müller <ulm@gentoo.org>
2 7
3 * version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr): 8 * version.el (emacs-bzr-version-dirstate, emacs-bzr-version-bzr):
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 08031c846cf..4be3b584a72 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -239,7 +239,8 @@ selected. When higher versions are available from archives with
239lower priorities, the user has to select those manually. 239lower priorities, the user has to select those manually.
240 240
241Archives not in this list have the priority 0." 241Archives not in this list have the priority 0."
242 :type 'integer 242 :type '(alist :key-type (string :tag "Archive name")
243 :value-type (integer :tag "Priority (default is 0)"))
243 :risky t 244 :risky t
244 :group 'package 245 :group 'package
245 :version "25.1") 246 :version "25.1")