Commit 23c2e0e4 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.

* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
parent e94a9773
2008-04-11 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
2008-04-11 Jan Djärv <jan.h.d@swipnet.se>
* tooltip.el (tooltip-show-help-non-mode): Set message-truncate-lines
......
......@@ -311,11 +311,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
bootstrap-prepare:
if test -x $(EMACS); then \
$(MAKE) $(MFLAGS) autoloads; \
else \
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi
chmod +w $(lisp)/loaddefs.el \
$(lisp)/ps-print.el \
chmod +w $(lisp)/ps-print.el \
$(lisp)/emacs-lisp/cl-loaddefs.el
maintainer-clean: distclean bootstrap-clean
......
......@@ -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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment