From abd1ae34a6e01624ba31c7f04d7602237d73a0e3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 1 Oct 2013 11:52:53 -0400 Subject: [PATCH] * lisp/emacs-lisp/package.el (package-desc): Simplify. Fixes: debbugs:15495 --- lisp/ChangeLog | 4 ++++ lisp/emacs-lisp/package.el | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index facdb2304d6..8707c02f540 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-10-01 Stefan Monnier + + * emacs-lisp/package.el (package-desc): Simplify (bug#15495). + 2013-10-01 Mitchel Humpherys (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 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. -- 2.39.2