Mercurial > emacs

changeset 111459:c62a6dd970b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/startup.el (package-initialize): Update declaration.
author Glenn Morris <rgm@gnu.org>
date Tue, 09 Nov 2010 20:11:08 -0800
parents 8db0bd23f378
children ca911a71a6c8
files lisp/ChangeLog lisp/startup.el
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
 
--- 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)