Mercurial > emacs
changeset 111780:e235f9dbb282
Merge changes from emacs-23 branch.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 27 Nov 2010 15:06:23 -0500 |
| parents | 539e3b0aef5f (diff) 141d3f14d8c3 (current diff) |
| children | 0bd93f14fcb6 |
| files | lisp/ChangeLog |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 27 15:04:57 2010 -0500 +++ b/lisp/ChangeLog Sat Nov 27 15:06:23 2010 -0500 @@ -108,6 +108,11 @@ * lpr.el (lpr-buffer, print-buffer, lpr-region, print-region): Prompt user before actually printing. +2010-11-27 Glenn Morris <rgm@gnu.org> + + * startup.el (package-enable-at-startup, package-initialize): + Remove unnecessary declarations. + 2010-11-27 Eli Zaretskii <eliz@gnu.org> * international/characters.el (glyphless-char-display-control):
--- a/lisp/startup.el Sat Nov 27 15:04:57 2010 -0500 +++ b/lisp/startup.el Sat Nov 27 15:06:23 2010 -0500 @@ -688,9 +688,6 @@ (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" (&optional no-activate)) (defun command-line () (setq before-init-time (current-time)