aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/package.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c454bc30fb..c91cb5564ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-08-03 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/package.el (package-desc-from-define): Ignore unknown keys.
4
12013-08-02 Stefan Monnier <monnier@iro.umontreal.ca> 52013-08-02 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/easy-mmode.el (define-globalized-minor-mode) 7 * emacs-lisp/easy-mmode.el (define-globalized-minor-mode)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 68d2880d33e..add73fd4bde 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -296,7 +296,7 @@ contrast, `package-user-dir' contains packages for personal use."
296 (:constructor 296 (:constructor
297 package-desc-from-define 297 package-desc-from-define
298 (name-string version-string &optional summary requirements 298 (name-string version-string &optional summary requirements
299 &key kind archive 299 &key kind archive &allow-other-keys
300 &aux 300 &aux
301 (name (intern name-string)) 301 (name (intern name-string))
302 (version (version-to-list version-string)) 302 (version (version-to-list version-string))