From 23c2e0e4abdaa4c46f4feb21e0d69f28151730f0 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 11 Apr 2008 13:27:14 +0000 Subject: * Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs. * loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist. --- lisp/loadup.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index b3deea67fbe..8581f05fedb 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -81,7 +81,13 @@ (message "Lists of integers (garbage collection statistics) are normal output") (message "while building Emacs; they do not indicate a problem.") (message "%s" (garbage-collect)) -(load "loaddefs.el") ;Don't get confused if someone compiled this by mistake. + +(condition-case nil + ;; Don't get confused if someone compiled this by mistake. + (load "loaddefs.el") + ;; In case loaddefs hasn't been generated yet. + (file-error (load "ldefs-boot.el"))) + (message "%s" (garbage-collect)) (load "simple") -- cgit v1.2.1