[Emacs-diffs] trunk r114487: * lisp/emacs-lisp/package.el (package-buffer-info, describe-package-1):

[Dmitry Gutov]

------------------------------------------------------------
revno: 114487
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-01 04:38:37 +0300
message:
  * lisp/emacs-lisp/package.el (package-buffer-info, describe-package-1):
  Use :url instead of :homepage, as per
  http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00622.html
  
  * test/automated/package-test.el: Update all cases to use :url instead
  of :homepage.
  
  * test/automated/package-x-test.el
  (package-x-test--single-archive-entry-1-3): Same.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/data/package/archive-contents 
archivecontents-20130627091649-1urk343g07eug5h7-3
  test/automated/data/package/multi-file-0.2.3.tar 
multifile0.2.3.tar-20130627091649-1urk343g07eug5h7-4
  test/automated/package-test.el 
packagetest.el-20130627091655-6mb005jio30t2i3i-1
  test/automated/package-x-test.el 
packagextest.el-20130627091657-y6z4ce9fzk0b3j1j-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-01 01:13:48 +0000
+++ b/lisp/ChangeLog    2013-10-01 01:38:37 +0000
@@ -1,5 +1,9 @@
 2013-10-01  Dmitry Gutov  <address@hidden>
 
+       * emacs-lisp/package.el (package-buffer-info, describe-package-1):
+       Use :url instead of :homepage, as per
+       http://lists.gnu.org/archive/html/emacs-devel/2013-09/msg00622.html
+
        * newcomment.el (comment-beginning): When `comment-use-syntax' is
        non-nil, use `syntax-ppss' (Bug#15251).
 

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-09-29 19:41:00 +0000
+++ b/lisp/emacs-lisp/package.el        2013-10-01 01:38:37 +0000
@@ -1038,7 +1038,7 @@
        file-name pkg-version desc
        (if requires-str (package-read-from-string requires-str))
        :kind 'single
-       :homepage homepage))))
+       :url homepage))))
 
 (declare-function tar-get-file-descriptor "tar-mode" (file))
 (declare-function tar--extract "tar-mode" (descriptor))
@@ -1207,8 +1207,7 @@
          (reqs (if desc (package-desc-reqs desc)))
          (version (if desc (package-desc-version desc)))
          (archive (if desc (package-desc-archive desc)))
-         (homepage (if desc (cdr (assoc :homepage
-                                        (package-desc-extras desc)))))
+         (homepage (if desc (cdr (assoc :url (package-desc-extras desc)))))
          (built-in (eq pkg-dir 'builtin))
          (installable (and archive (not built-in)))
          (status (if desc (package-desc-status desc) "orphan")))

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-09-29 19:41:00 +0000
+++ b/test/ChangeLog    2013-10-01 01:38:37 +0000
@@ -1,3 +1,11 @@
+2013-10-01  Dmitry Gutov  <address@hidden>
+
+       * automated/package-test.el: Update all cases to use :url instead
+       of :homepage.
+
+       * automated/package-x-test.el
+       (package-x-test--single-archive-entry-1-3): Same.
+
 2013-09-29  Dmitry Gutov  <address@hidden>
 
        * automated/package-test.el (simple-single-desc-1-4): Remove, it

=== modified file 'test/automated/data/package/archive-contents'
--- a/test/automated/data/package/archive-contents      2013-09-29 19:41:00 
+0000
+++ b/test/automated/data/package/archive-contents      2013-10-01 01:38:37 
+0000
@@ -2,11 +2,11 @@
  (simple-single .
                 [(1 3)
                  nil "A single-file package with no dependencies" single
-                 ((:homepage . "http://doodles.au";))])
+                 ((:url . "http://doodles.au";))])
  (simple-depend .
                 [(1 0)
                  ((simple-single (1 3))) "A single-file package with a 
dependency." single])
  (multi-file .
              [(0 2 3)
               nil "Example of a multi-file tar package" tar
-              ((:homepage . "http://puddles.li";))]))
+              ((:url . "http://puddles.li";))]))

=== modified file 'test/automated/data/package/multi-file-0.2.3.tar'
Binary files a/test/automated/data/package/multi-file-0.2.3.tar 2013-09-29 
19:41:00 +0000 and b/test/automated/data/package/multi-file-0.2.3.tar        
2013-10-01 01:38:37 +0000 differ
=== modified file 'test/automated/package-test.el'
--- a/test/automated/package-test.el    2013-09-29 19:41:00 +0000
+++ b/test/automated/package-test.el    2013-10-01 01:38:37 +0000
@@ -48,7 +48,7 @@
                        :version '(1 3)
                        :summary "A single-file package with no dependencies"
                        :kind 'single
-                       :extras '((:homepage . "http://doodles.au";)))
+                       :extras '((:url . "http://doodles.au";)))
   "Expected `package-desc' parsed from simple-single-1.3.el.")
 
 (defvar simple-depend-desc
@@ -64,7 +64,7 @@
                        :version '(0 2 3)
                        :summary "Example of a multi-file tar package"
                        :kind 'tar
-                       :extras '((:homepage . "http://puddles.li";)))
+                       :extras '((:url . "http://puddles.li";)))
   "Expected `package-desc' from \"multi-file-0.2.3.tar\".")
 
 (defvar new-pkg-desc
@@ -189,7 +189,7 @@
                          (concat "(define-package \"simple-single\" \"1.3\" "
                                  "\"A single-file package "
                                  "with no dependencies\" 'nil "
-                                 ":homepage \"http://doodles.au\"";
+                                 ":url \"http://doodles.au\"";
                                  ")\n"))))
       (should (file-exists-p autoloads-file))
       (should-not (get-file-buffer autoloads-file)))))

=== modified file 'test/automated/package-x-test.el'
--- a/test/automated/package-x-test.el  2013-09-29 19:41:00 +0000
+++ b/test/automated/package-x-test.el  2013-10-01 01:38:37 +0000
@@ -49,7 +49,7 @@
         (package-make-ac-desc '(1 3) nil
                               "A single-file package with no dependencies"
                               'single
-                              '((:homepage . "http://doodles.au";))))
+                              '((:url . "http://doodles.au";))))
   "Expected contents of the archive entry from the \"simple-single\" package.")
 
 (defvar package-x-test--single-archive-entry-1-4