* lisp/emacs-lisp/package.el (package-desc): Simplify.

Fixes: debbugs:15495

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index facdb23..8707c02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package-desc): Simplify (bug#15495).
+
 2013-10-01  Mitchel Humpherys  <mitch.special@gmail.com>  (tiny change)
 
        * vc/vc-git.el (vc-git-grep): Disable pager.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e46f047..ec01d16 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -309,13 +309,12 @@ contrast, `package-user-dir' contains packages for personal use."
                  (kind (plist-get rest-plist :kind))
                  (archive (plist-get rest-plist :archive))
                  (extras (let (alist)
-                           (cl-remf rest-plist :kind)
-                           (cl-remf rest-plist :archive)
                            (while rest-plist
-                             (let ((value (cadr rest-plist)))
-                               (when value
-                                 (push (cons (car rest-plist) value)
-                                       alist)))
+                             (unless (memq (car rest-plist) '(:kind :archive))
+                               (let ((value (cadr rest-plist)))
+                                 (when value
+                                   (push (cons (car rest-plist) value)
+                                         alist))))
                              (setq rest-plist (cddr rest-plist)))
                            alist)))))
   "Structure containing information about an individual package.