* lisp/emacs-lisp/package.el (package-generate-autoloads): Remove `require'

which should not be needed any more.
(package-menu-refresh, package-menu-describe-package): Use user-error.

2 files changed, 6 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 059bb0218f3..b866f4f93aa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/package.el (package-generate-autoloads): Remove `require'
+        which should not be needed any more.
+        (package-menu-refresh, package-menu-describe-package): Use user-error.
+
         * eshell/esh-cmd.el (eshell-post-rewrite-command-function): New var.
         (eshell-post-rewrite-command-hook): Make obsolete.
         (eshell-parse-command): Simplify.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 7799ee23d62..77496bad441 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -597,7 +597,6 @@ EXTRA-PROPERTIES is currently unused."
 (defvar version-control)
 
 (defun package-generate-autoloads (name pkg-dir)
-  (require 'autoload)         ;Load before we let-bind generated-autoload-file!
   (let* ((auto-name (format "%s-autoloads.el" name))
          ;;(ignore-name (concat name "-pkg.el"))
          (generated-autoload-file (expand-file-name auto-name pkg-dir))
@@ -1523,7 +1522,7 @@ This fetches the contents of each archive specified in
 `package-archives', and then refreshes the package menu."
   (interactive)
   (unless (derived-mode-p 'package-menu-mode)
-    (error "The current buffer is not a Package Menu"))
+    (user-error "The current buffer is not a Package Menu"))
   (package-refresh-contents)
   (package-menu--generate t t))
 
@@ -1535,7 +1534,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
                     (tabulated-list-get-id))))
     (if pkg-desc
         (describe-package pkg-desc)
-      (error "No package here"))))
+      (user-error "No package here"))))
 
 ;; fixme numeric argument
 (defun package-menu-mark-delete (&optional _num)