[Emacs-diffs] trunk r114332: * lisp/emacs-lisp/package.el (package-generate-autoloads): Remove `require'

[Stefan Monnier]

------------------------------------------------------------
revno: 114332
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 11:52:31 -0400
message:
  * 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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-17 15:19:12 +0000
+++ b/lisp/ChangeLog    2013-09-17 15:52:31 +0000
@@ -1,5 +1,9 @@
 2013-09-17  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-09-03 18:21:41 +0000
+++ b/lisp/emacs-lisp/package.el        2013-09-17 15:52:31 +0000
@@ -597,7 +597,6 @@
 (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 @@
 `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 @@
                    (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)