diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c194e1352ac..c23be253b37 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -702,14 +702,25 @@ untar into a directory named DIR; otherwise, signal an error." (list (car elt) (package-version-join (cadr elt)))) requires)))) - (package--alist-to-plist - (package-desc-extras pkg-desc)))) + (let ((alist (package-desc-extras pkg-desc)) + flat) + (while alist + (let* ((pair (pop alist)) + (key (car pair)) + (val (cdr pair))) + ;; Don't bother ‘quote’ing ‘key’; it is always a keyword. + (push key flat) + (push (if (and (not (consp val)) + (or (keywordp val) + (not (symbolp val)) + (memq val '(nil t)))) + val + `',val) + flat))) + (nreverse flat)))) "\n") nil pkg-file nil 'silent)))) -(defun package--alist-to-plist (alist) - (apply #'nconc (mapcar (lambda (pair) (list (car pair) (cdr pair))) alist))) - (defun package-unpack (pkg-desc) "Install the contents of the current buffer as a package." (let* ((name (package-desc-name pkg-desc)) |