summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/startup.el8
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79bd52cec6f..45bee01c97d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2010-11-01 Glenn Morris <rgm@gnu.org>
+ * startup.el (package-enable-at-startup, package-initialize):
+ Silence compiler.
+
* progmodes/ada-mode.el (ada-font-lock-syntactic-keywords):
Silence compiler.
diff --git a/lisp/startup.el b/lisp/startup.el
index 31fb7507295..5343da65a10 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
;;; startup.el --- process Emacs shell arguments
-;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
+;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;; Free Software Foundation, Inc.
;; Maintainer: FSF
@@ -691,6 +691,9 @@ opening the first frame (e.g. open a connection to an X server).")
(defvar server-name)
(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" ())
(defun command-line ()
(setq before-init-time (current-time)
@@ -2381,5 +2384,4 @@ A fancy display is used on graphic displays, normal otherwise."
(setq file (replace-match "/" t t file)))
file))
-;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
;;; startup.el ends here