summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-10-01 11:52:53 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-10-01 11:52:53 -0400
commitabd1ae34a6e01624ba31c7f04d7602237d73a0e3 (patch)
tree185653313f4bef4e18dca0cd6bbe503a34b72ba6 /lisp/emacs-lisp
parentbe4e325d032085361b3b7d0759662b04197c37e7 (diff)
downloademacs-abd1ae34a6e01624ba31c7f04d7602237d73a0e3.tar.gz
emacs-abd1ae34a6e01624ba31c7f04d7602237d73a0e3.tar.bz2
emacs-abd1ae34a6e01624ba31c7f04d7602237d73a0e3.zip
* lisp/emacs-lisp/package.el (package-desc): Simplify.
Fixes: debbugs:15495
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e46f0474e3b..ec01d16329f 100644
--- 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.