Commit 1197f2e6 authored by Dmitry Gutov's avatar Dmitry Gutov

Fix bug#16873

* lisp/emacs-lisp/package.el (package-desc): Use the contents of the
quoted form, not its cdr.
parent 45681788
2014-03-22 Dmitry Gutov <dgutov@yandex.ru>
* emacs-lisp/package.el (package-desc): Use the contents of the
quoted form, not its cdr. (Bug#16873)
2014-03-22 Juanma Barranquero <lekktu@gmail.com> 2014-03-22 Juanma Barranquero <lekktu@gmail.com>
* w32-common-fns.el (x-selection-owner-p): Add empty docstring for the * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
......
...@@ -334,7 +334,7 @@ contrast, `package-user-dir' contains packages for personal use." ...@@ -334,7 +334,7 @@ contrast, `package-user-dir' contains packages for personal use."
(when value (when value
(push (cons (car rest-plist) (push (cons (car rest-plist)
(if (eq (car-safe value) 'quote) (if (eq (car-safe value) 'quote)
(cdr value) (cadr value)
value)) value))
alist)))) alist))))
(setq rest-plist (cddr rest-plist))) (setq rest-plist (cddr rest-plist)))
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
(simple-single . (simple-single .
[(1 3) [(1 3)
nil "A single-file package with no dependencies" single nil "A single-file package with no dependencies" single
((:url . "http://doodles.au"))]) ((:url . "http://doodles.au")
(:keywords quote ("frobnicate")))])
(simple-depend . (simple-depend .
[(1 0) [(1 0)
((simple-single (1 3))) "A single-file package with a dependency." single]) ((simple-single (1 3))) "A single-file package with a dependency." single])
......
...@@ -326,6 +326,7 @@ Must called from within a `tar-mode' buffer." ...@@ -326,6 +326,7 @@ Must called from within a `tar-mode' buffer."
(should (search-forward "Summary: A single-file package with no dependencies" (should (search-forward "Summary: A single-file package with no dependencies"
nil t)) nil t))
(should (search-forward "Homepage: http://doodles.au" nil t)) (should (search-forward "Homepage: http://doodles.au" nil t))
(should (search-forward "Keywords: frobnicate"))
;; No description, though. Because at this point we don't know ;; No description, though. Because at this point we don't know
;; what archive the package originated from, and we don't have ;; what archive the package originated from, and we don't have
;; its readme file saved. ;; its readme file saved.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment