comparison lisp/startup.el @ 263:727739f917cb r20-5b30

Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 51092a27c943
children 966663fcf606
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
649 (condition-case error 649 (condition-case error
650 (progn 650 (progn
651 (load-user-init-file init-file-user) 651 (load-user-init-file init-file-user)
652 (setq init-file-had-error nil)) 652 (setq init-file-had-error nil))
653 (error 653 (error
654 (message "Error in init file: ") 654 (message "Error in init file: %s" (error-message-string error))
655 (display-error error nil) 655 (display-warning 'initialization
656 (format "\
657 An error has occured while loading %s:
658
659 %s
660
661 To ensure normal operation, you should investigate the cause of the error
662 in your initialization file and remove it. Use the `-debug-init' option
663 to XEmacs to view a complete error backtrace."
664 user-init-file (error-message-string error))
665 'error)
656 (setq init-file-had-error t)))) 666 (setq init-file-had-error t))))
657 ;; If we can tell that the init file altered debug-on-error, 667 ;; If we can tell that the init file altered debug-on-error,
658 ;; arrange to preserve the value that it set up. 668 ;; arrange to preserve the value that it set up.
659 (or (eq debug-on-error debug-on-error-initial) 669 (or (eq debug-on-error debug-on-error-initial)
660 (setq debug-on-error-should-be-set t 670 (setq debug-on-error-should-be-set t