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

Import from CVS: tag r21-0b55
author cvs
date Mon, 13 Aug 2007 10:44:22 +0200
parents 33bdb3d4b97f
children 7c94d56991e1
comparison
equal deleted inserted replaced
313:2905de29931f 314:341dac730539
400 (load (expand-file-name (file-name-sans-extension autoload-file-name) 400 (load (expand-file-name (file-name-sans-extension autoload-file-name)
401 lisp-directory) nil t)) 401 lisp-directory) nil t))
402 402
403 (if (not inhibit-autoloads) 403 (if (not inhibit-autoloads)
404 (progn 404 (progn
405 (packages-load-package-auto-autoloads last-package-load-path) 405 (if (not inhibit-early-packages)
406 (packages-load-package-auto-autoloads early-package-load-path))
406 (packages-load-package-auto-autoloads late-package-load-path) 407 (packages-load-package-auto-autoloads late-package-load-path)
407 (if (not inhibit-early-packages) 408 (packages-load-package-auto-autoloads last-package-load-path)))
408 (packages-load-package-auto-autoloads early-package-load-path))))
409 409
410 (unwind-protect 410 (unwind-protect
411 (command-line) 411 (command-line)
412 ;; Do this again, in case .emacs defined more abbreviations. 412 ;; Do this again, in case .emacs defined more abbreviations.
413 (setq default-directory (abbreviate-file-name default-directory)) 413 (setq default-directory (abbreviate-file-name default-directory))
678 (setq init-file-had-error nil)) 678 (setq init-file-had-error nil))
679 (error 679 (error
680 (message "Error in init file: %s" (error-message-string error)) 680 (message "Error in init file: %s" (error-message-string error))
681 (display-warning 'initialization 681 (display-warning 'initialization
682 (format "\ 682 (format "\
683 An error has occured while loading %s: 683 An error has occurred while loading %s:
684 684
685 %s 685 %s
686 686
687 To ensure normal operation, you should investigate the cause of the error 687 To ensure normal operation, you should investigate the cause of the error
688 in your initialization file and remove it. Use the `-debug-init' option 688 in your initialization file and remove it. Use the `-debug-init' option