aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-07-06 00:23:25 -0700
committerGlenn Morris2012-07-06 00:23:25 -0700
commit938d1f57c32d5d5331a6dd08c97b09b1821cdea1 (patch)
tree56c92dc07904375cfa7fc27e2d6b4a00f28d3533
parent50394322c54ab8b51b752c0abe11d75dff5dd18e (diff)
downloademacs-938d1f57c32d5d5331a6dd08c97b09b1821cdea1.tar.gz
emacs-938d1f57c32d5d5331a6dd08c97b09b1821cdea1.zip
Move a comment from lisp/Makefile.in to lisp/loadup.el.
The comment in Makefile.in has been orphaned ever since the bootstrap-prepare rule was removed in 2008.
-rw-r--r--lisp/Makefile.in13
-rw-r--r--lisp/loadup.el11
2 files changed, 11 insertions, 13 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index babb5f3369f..9640fc27414 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -414,19 +414,6 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
414 --eval "(setq make-backup-files nil)" \ 414 --eval "(setq make-backup-files nil)" \
415 -f batch-update-autoloads $(CAL_DIR) 415 -f batch-update-autoloads $(CAL_DIR)
416 416
417# Prepare a bootstrap in the lisp subdirectory.
418#
419# Build loaddefs.el to make sure it's up-to-date. If it's not, that
420# might lead to errors during the bootstrap because something fails to
421# autoload as expected. If there is no emacs binary, then we can't
422# build autoloads yet. In that case we have to use ldefs-boot.el.
423# Bootstrap should always work with ldefs-boot.el. Therefore,
424# whenever a new autoload cookie gets added that is necessary during
425# bootstrapping, ldefs-boot.el should be updated by overwriting it with
426# an up-to-date copy of loaddefs.el that is uncorrupted by
427# local changes. (Because loaddefs.el is an automatically generated
428# file, we don't want to store it in the source repository).
429
430bootstrap-clean: 417bootstrap-clean:
431 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL) 418 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL)
432 419
diff --git a/lisp/loadup.el b/lisp/loadup.el
index b24e3ccf7f7..db994242c18 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -108,6 +108,17 @@
108(load "button") 108(load "button")
109(load "startup") 109(load "startup")
110 110
111;; We don't want to store loaddefs.el in the repository because it is
112;; a generated file; but it is required in order to compile the lisp files.
113;; When bootstrapping, we cannot generate loaddefs.el until an
114;; emacs binary has been built. We therefore compromise and keep
115;; ldefs-boot.el in the repository. This does not need to be updated
116;; as often as the real loaddefs.el would. Bootstrap should always
117;; work with ldefs-boot.el. Therefore, Whenever a new autoload cookie
118;; gets added that is necessary during bootstrapping, ldefs-boot.el
119;; should be updated by overwriting it with an up-to-date copy of
120;; loaddefs.el that is uncorrupted by local changes.
121;; autogen/update_autogen can be used to periodically update ldefs-boot.
111(condition-case nil 122(condition-case nil
112 ;; Don't get confused if someone compiled this by mistake. 123 ;; Don't get confused if someone compiled this by mistake.
113 (load "loaddefs.el") 124 (load "loaddefs.el")