[Emacs-diffs] emacs-24 r116830: Fix bug#16873

[Dmitry Gutov]

------------------------------------------------------------
revno: 116830
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16873
committer: Dmitry Gutov <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-03-22 10:43:30 +0200
message:
  Fix bug#16873
  
  * lisp/emacs-lisp/package.el (package-desc): Use the contents of the
  quoted form, not its cdr.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2
  test/automated/data/package/archive-contents 
archivecontents-20130627091649-1urk343g07eug5h7-3
  test/automated/package-test.el 
packagetest.el-20130627091655-6mb005jio30t2i3i-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-22 08:28:20 +0000
+++ b/lisp/ChangeLog    2014-03-22 08:43:30 +0000
@@ -1,3 +1,8 @@
+2014-03-22  Dmitry Gutov  <address@hidden>
+
+       * emacs-lisp/package.el (package-desc): Use the contents of the
+       quoted form, not its cdr.  (Bug#16873)
+
 2014-03-22  Juanma Barranquero  <address@hidden>
 
        * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-03-21 06:06:52 +0000
+++ b/lisp/emacs-lisp/package.el        2014-03-22 08:43:30 +0000
@@ -334,7 +334,7 @@
                                  (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)))

=== modified file 'test/automated/data/package/archive-contents'
--- a/test/automated/data/package/archive-contents      2014-03-21 06:06:52 
+0000
+++ b/test/automated/data/package/archive-contents      2014-03-22 08:43:30 
+0000
@@ -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])

=== modified file 'test/automated/package-test.el'
--- a/test/automated/package-test.el    2014-03-21 06:06:52 +0000
+++ b/test/automated/package-test.el    2014-03-22 08:43:30 +0000
@@ -326,6 +326,7 @@
      (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.