[Emacs-diffs] trunk r114490: * lisp/emacs-lisp/package.el (package-desc): Simplify.

[Stefan Monnier]

------------------------------------------------------------
revno: 114490
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15495
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-01 11:52:53 -0400
message:
  * lisp/emacs-lisp/package.el (package-desc): Simplify.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-01 15:34:14 +0000
+++ b/lisp/ChangeLog    2013-10-01 15:52:53 +0000
@@ -1,3 +1,7 @@
+2013-10-01  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-desc): Simplify (bug#15495).
+
 2013-10-01  Mitchel Humpherys  <address@hidden>  (tiny change)
 
        * vc/vc-git.el (vc-git-grep): Disable pager.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-10-01 01:38:37 +0000
+++ b/lisp/emacs-lisp/package.el        2013-10-01 15:52:53 +0000
@@ -309,13 +309,12 @@
                  (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.