* lisp/startup.el (package-initialize): Update declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 093dad1461ca936569abd318de4f5905390f7e25..f5b45fda9259d04c7b5a0fa109aefcc8765683e4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-11-10  Glenn Morris  <rgm@gnu.org>
 
+       * startup.el (package-initialize): Update declaration.
+
        * textmodes/remember.el (remember-time-to-seconds): Remove.
        (remember-store-in-mailbox): Use float-time.
 

diff --git a/lisp/startup.el b/lisp/startup.el
index 5343da65a1018db52baff052b17d76c1f98e1448..b77b4b97d5b96497ff9397c409fe0d49509322d8 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -693,7 +693,7 @@ opening the first frame (e.g. open a connection to an X server).")
 (defvar server-process)
 ;; Autoload in package.el, but when we bootstrap, we don't have loaddefs yet.
 (defvar package-enable-at-startup)
-(declare-function package-initialize "package" ())
+(declare-function package-initialize "package" (&optional no-activate))
 
 (defun command-line ()
   (setq before-init-time (current-time)