From 938d1f57c32d5d5331a6dd08c97b09b1821cdea1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 6 Jul 2012 00:23:25 -0700 Subject: [PATCH] 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. --- lisp/Makefile.in | 13 ------------- lisp/loadup.el | 11 +++++++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/lisp/Makefile.in b/lisp/Makefile.in index babb5f3369..9640fc2741 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -414,19 +414,6 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) -# Prepare a bootstrap in the lisp subdirectory. -# -# Build loaddefs.el to make sure it's up-to-date. If it's not, that -# might lead to errors during the bootstrap because something fails to -# autoload as expected. If there is no emacs binary, then we can't -# build autoloads yet. In that case we have to use ldefs-boot.el. -# Bootstrap should always work with ldefs-boot.el. Therefore, -# whenever a new autoload cookie gets added that is necessary during -# bootstrapping, ldefs-boot.el should be updated by overwriting it with -# an up-to-date copy of loaddefs.el that is uncorrupted by -# local changes. (Because loaddefs.el is an automatically generated -# file, we don't want to store it in the source repository). - bootstrap-clean: cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL) diff --git a/lisp/loadup.el b/lisp/loadup.el index b24e3ccf7f..db994242c1 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -108,6 +108,17 @@ (load "button") (load "startup") +;; We don't want to store loaddefs.el in the repository because it is +;; a generated file; but it is required in order to compile the lisp files. +;; When bootstrapping, we cannot generate loaddefs.el until an +;; emacs binary has been built. We therefore compromise and keep +;; ldefs-boot.el in the repository. This does not need to be updated +;; as often as the real loaddefs.el would. Bootstrap should always +;; work with ldefs-boot.el. Therefore, Whenever a new autoload cookie +;; gets added that is necessary during bootstrapping, ldefs-boot.el +;; should be updated by overwriting it with an up-to-date copy of +;; loaddefs.el that is uncorrupted by local changes. +;; autogen/update_autogen can be used to periodically update ldefs-boot. (condition-case nil ;; Don't get confused if someone compiled this by mistake. (load "loaddefs.el") -- 2.20.1