diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-11-09 20:11:08 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-11-09 20:11:08 -0800 |
| commit | 9228bbd3458f4b827a01bb2a4d28b3f77f6d3ac5 (patch) | |
| tree | 69f93eca95dbed93bad61a3abe19a5984b1fbf4d | |
| parent | 89eee1e053de671837a9d03bb95eff418e3bc688 (diff) | |
| download | emacs-9228bbd3458f4b827a01bb2a4d28b3f77f6d3ac5.tar.gz | |
* lisp/startup.el (package-initialize): Update declaration.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 093dad1461c..f5b45fda925 100644 --- 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 5343da65a10..b77b4b97d5b 100644 --- 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) |