[Emacs-diffs] /srv/bzr/emacs/trunk r102307: * lisp/startup.el (package-initialize): Update declaration.

[Glenn Morris]

------------------------------------------------------------
revno: 102307
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-09 20:11:08 -0800
message:
  * lisp/startup.el (package-initialize): Update declaration.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-10 04:08:15 +0000
+++ b/lisp/ChangeLog    2010-11-10 04:11:08 +0000
@@ -1,5 +1,7 @@
 2010-11-10  Glenn Morris  <address@hidden>
 
+       * startup.el (package-initialize): Update declaration.
+
        * textmodes/remember.el (remember-time-to-seconds): Remove.
        (remember-store-in-mailbox): Use float-time.
 

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2010-11-01 02:51:59 +0000
+++ b/lisp/startup.el   2010-11-10 04:11:08 +0000
@@ -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)