Mercurial > hg > xemacs-beta
diff lisp/startup.el @ 373:6240c7796c7a r21-2b2
Import from CVS: tag r21-2b2
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:04:06 +0200 |
parents | cc15677e0335 |
children | 8626e4521993 |
line wrap: on
line diff
--- a/lisp/startup.el Mon Aug 13 11:03:09 2007 +0200 +++ b/lisp/startup.el Mon Aug 13 11:04:06 2007 +0200 @@ -402,10 +402,10 @@ (if (not inhibit-autoloads) (progn - (packages-load-package-auto-autoloads last-package-load-path) + (if (not inhibit-early-packages) + (packages-load-package-auto-autoloads early-package-load-path)) (packages-load-package-auto-autoloads late-package-load-path) - (if (not inhibit-early-packages) - (packages-load-package-auto-autoloads early-package-load-path)))) + (packages-load-package-auto-autoloads last-package-load-path))) (unwind-protect (command-line) @@ -680,7 +680,7 @@ (message "Error in init file: %s" (error-message-string error)) (display-warning 'initialization (format "\ -An error has occured while loading %s: +An error has occurred while loading %s: %s @@ -935,7 +935,7 @@ " to see what this means.\n"))) `( "\n")) (face bold-italic "\ -Copyright (C) 1985-1997 Free Software Foundation, Inc. +Copyright (C) 1985-1998 Free Software Foundation, Inc. Copyright (C) 1990-1994 Lucid, Inc. Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved. Copyright (C) 1994-1996 Board of Trustees, University of Illinois