Mercurial > emacs
changeset 94001:96f9ff09bbb0
* Makefile.in (bootstrap-prepare): Don't copy ldefs-boot over loaddefs.
* loadup.el: Load ldefs-boot.el if loaddefs.el doesn't exist.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 11 Apr 2008 13:27:14 +0000 |
| parents | ee22366f2a68 |
| children | bae1479690d4 |
| files | lisp/ChangeLog lisp/Makefile.in lisp/loadup.el |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Apr 11 07:44:49 2008 +0000 +++ b/lisp/ChangeLog Fri Apr 11 13:27:14 2008 +0000 @@ -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> * tooltip.el (tooltip-show-help-non-mode): Set message-truncate-lines
--- a/lisp/Makefile.in Fri Apr 11 07:44:49 2008 +0000 +++ b/lisp/Makefile.in Fri Apr 11 13:27:14 2008 +0000 @@ -311,11 +311,8 @@ 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
--- a/lisp/loadup.el Fri Apr 11 07:44:49 2008 +0000 +++ b/lisp/loadup.el Fri Apr 11 13:27:14 2008 +0000 @@ -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")