* 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.

7 files changed, 20 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab8c87fca97..0115f9d0cf4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-01  Dmitry Gutov  <dgutov@yandex.ru>
 
+        * 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).
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 785263789b0..e46f0474e3b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1038,7 +1038,7 @@ boundaries."
        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 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
          (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")))
diff --git a/test/ChangeLog b/test/ChangeLog
index 3f115d9e4e8..bf8ecbcb9eb 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-01  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * 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  <dgutov@yandex.ru>
 
         * automated/package-test.el (simple-single-desc-1-4): Remove, it
diff --git a/test/automated/data/package/archive-contents b/test/automated/data/package/archive-contents
index b26179c0c3b..8d6f3226ae6 100644
--- a/test/automated/data/package/archive-contents
+++ b/test/automated/data/package/archive-contents
@@ -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"))]))
diff --git a/test/automated/data/package/multi-file-0.2.3.tar b/test/automated/data/package/multi-file-0.2.3.tar
index dde331d0e01..2f1c5e93df1 100644
--- a/test/automated/data/package/multi-file-0.2.3.tar
+++ b/test/automated/data/package/multi-file-0.2.3.tar
diff --git a/test/automated/package-test.el b/test/automated/package-test.el
index b5235ee99a9..84f520df9bc 100644
--- a/test/automated/package-test.el
+++ b/test/automated/package-test.el
@@ -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 @@ Must called from within a `tar-mode' buffer."
                          (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)))))
diff --git a/test/automated/package-x-test.el b/test/automated/package-x-test.el
index c7b82360dd8..ab90d59c19d 100644
--- a/test/automated/package-x-test.el
+++ b/test/automated/package-x-test.el
@@ -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