comparison 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
comparison
equal deleted inserted replaced
372:49e1ed2d7ed8 373:6240c7796c7a
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
933 `( (face (bold blue) ( "This is an Experimental version of XEmacs. " 933 `( (face (bold blue) ( "This is an Experimental version of XEmacs. "
934 " Type " (key describe-beta) 934 " Type " (key describe-beta)
935 " to see what this means.\n"))) 935 " to see what this means.\n")))
936 `( "\n")) 936 `( "\n"))
937 (face bold-italic "\ 937 (face bold-italic "\
938 Copyright (C) 1985-1997 Free Software Foundation, Inc. 938 Copyright (C) 1985-1998 Free Software Foundation, Inc.
939 Copyright (C) 1990-1994 Lucid, Inc. 939 Copyright (C) 1990-1994 Lucid, Inc.
940 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved. 940 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
941 Copyright (C) 1994-1996 Board of Trustees, University of Illinois 941 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
942 Copyright (C) 1995-1996 Ben Wing\n\n") 942 Copyright (C) 1995-1996 Ben Wing\n\n")
943 943