mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00
Code Issues Releases Activity

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

Browse Source 
* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
This commit is contained in:
Stefan Monnier 2008-04-11 13:27:14 +00:00
parent e94a977386
commit 23c2e0e4ab
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2008-04-11 Jan Djärv <jan.h.d@swipnet.se>
* tooltip.el (tooltip-show-help-non-mode): Set message-truncate-lines * tooltip.el (tooltip-show-help-non-mode): Set message-truncate-lines

5
lisp/Makefile.in
View File

@ -311,11 +311,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
bootstrap-prepare: bootstrap-prepare:
if test -x $(EMACS); then \ if test -x $(EMACS); then \
$(MAKE) $(MFLAGS) autoloads; \ $(MAKE) $(MFLAGS) autoloads; \
else \
cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \
fi fi
chmod +w $(lisp)/loaddefs.el \ chmod +w $(lisp)/ps-print.el \
$(lisp)/ps-print.el \
$(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/emacs-lisp/cl-loaddefs.el
maintainer-clean: distclean bootstrap-clean maintainer-clean: distclean bootstrap-clean

8
lisp/loadup.el
View File

@ -81,7 +81,13 @@
(message "Lists of integers (garbage collection statistics) are normal output") (message "Lists of integers (garbage collection statistics) are normal output")
(message "while building Emacs; they do not indicate a problem.") (message "while building Emacs; they do not indicate a problem.")
(message "%s" (garbage-collect)) (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)) (message "%s" (garbage-collect))
(load "simple") (load "simple")