From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 22 Mar 2014 08:43:30 +0000 (+0200)
Subject: Fix bug#16873
X-Git-Tag: emacs-24.3.90~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1197f2e66501837c96d0a5cc627e2791878066f2;p=emacs.git

Fix bug#16873

* lisp/emacs-lisp/package.el (package-desc): Use the contents of the
quoted form, not its cdr.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 516261666df..7cf7d50118c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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>
 
 	* w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ae2c2862887..480fddbd320 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -334,7 +334,7 @@ contrast, `package-user-dir' contains packages for personal use."
                                  (when value
                                    (push (cons (car rest-plist)
                                                (if (eq (car-safe value) 'quote)
-                                                   (cdr value)
+                                                   (cadr value)
                                                  value))
                                          alist))))
                              (setq rest-plist (cddr rest-plist)))
diff --git a/test/automated/data/package/archive-contents b/test/automated/data/package/archive-contents
index a6df6b8086e..e2f92304f86 100644
--- a/test/automated/data/package/archive-contents
+++ b/test/automated/data/package/archive-contents
@@ -2,7 +2,8 @@
  (simple-single .
                 [(1 3)
                  nil "A single-file package with no dependencies" single
-                 ((:url . "http://doodles.au"))])
+                 ((:url . "http://doodles.au")
+                  (:keywords quote ("frobnicate")))])
  (simple-depend .
                 [(1 0)
                  ((simple-single (1 3))) "A single-file package with a dependency." single])
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index 72422a8684b..6d0dcdab299 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -326,6 +326,7 @@ Must called from within a `tar-mode' buffer."
      (should (search-forward "Summary: A single-file package with no dependencies"
                              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
      ;; what archive the package originated from, and we don't have
      ;; its readme file saved.