mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Fix bug: Properly quote args to generated -pkg.el `define-package'.

Browse Source 
* lisp/emacs-lisp/package.el (package-generate-description-file):
Inline `package--alist-to-plist'; rewrite to selectively
quote alist values that are not self-quoting.
(package--alist-to-plist): Delete func.
This commit is contained in:
Thien-Thi Nguyen 2014-05-25 18:32:08 +02:00
parent cbe8e343e6
commit e50a0b6e9d
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ChangeLog
View File

@ -1,3 +1,12 @@
2014-05-25 Thien-Thi Nguyen <ttn@gnu.org>
Fix bug: Properly quote args to generated -pkg.el `define-package'.
* emacs-lisp/package.el (package-generate-description-file):
Inline `package--alist-to-plist'; rewrite to selectively
quote alist values that are not self-quoting.
(package--alist-to-plist): Delete func.
2014-05-25 Andreas Schwab <schwab@linux-m68k.org>
* term/xterm.el (xterm-function-map): Add mapping for shifted

21
lisp/emacs-lisp/package.el
View File

@ -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))