Mercurial > hg > xemacs-beta

diff lisp/startup.el @ 314:341dac730539 r21-0b55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b55
author cvs
date Mon, 13 Aug 2007 10:44:22 +0200
parents 33bdb3d4b97f
children 7c94d56991e1
line wrap: on
line diff
--- a/lisp/startup.el	Mon Aug 13 10:43:56 2007 +0200
+++ b/lisp/startup.el	Mon Aug 13 10:44:22 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