# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1289362268 28800
# Node ID c62a6dd970b95af9ae214db1ed284d35fd55c4a5
# Parent  8db0bd23f378888a1503cf16c7f5c4aa543c447d
* lisp/startup.el (package-initialize): Update declaration.

diff -r 8db0bd23f378 -r c62a6dd970b9 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 09 20:09:49 2010 -0800
+++ b/lisp/ChangeLog	Tue Nov 09 20:11:08 2010 -0800
@@ -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 -r 8db0bd23f378 -r c62a6dd970b9 lisp/startup.el
--- a/lisp/startup.el	Tue Nov 09 20:09:49 2010 -0800
+++ b/lisp/startup.el	Tue Nov 09 20:11:08 2010 -0800
@@ -693,7 +693,7 @@
 (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)