diff options
author | Phillip Lord <phillip.lord@russet.org.uk> | 2017-03-07 13:25:45 +0000 |
---|---|---|
committer | Phillip Lord <phillip.lord@russet.org.uk> | 2017-03-07 13:49:48 +0000 |
commit | 542a763281347b026b6714483299a108a8c3b9c2 (patch) | |
tree | 409e48faaec350983a446e450c9b434e14c5958e /lisp/loadup.el | |
parent | e37bfd41546f515cfef1f8d2c64df2dccac18a86 (diff) |
Revert "Replace ldefs-boot with a much smaller file"
This reverts commit c27b645956a11fab1dd8fa189254d525390958f5.
This commit has been reverted because the new mechanism was too
sensitive to changes in the lisp source, generation of new ldefs-boot
files was platform specific and resulted in warnings about undefined
variables.
See also 11436e2890d.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r-- | lisp/loadup.el | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 5b19b05a82e..922b1b44fda 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -143,21 +143,19 @@ (load "button") ;; 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 support the build with -;; two files, ldefs-boot-manual.el and ldefs-boot-auto.el, which -;; contain the autoloads that are actually called during bootstrap. -;; These do not need to be updated as often as the real loaddefs.el -;; would. Bootstrap should always work with ldefs-boot-manual.el. -;; Therefore, Whenever a new autoload cookie gets added that is -;; necessary during bootstrapping, ldefs-boot-auto.el should be -;; updated using the "generate-ldefs-boot" make target. -;; autogen/update_autogen can be used to periodically update -;; ldefs-boot. +;; 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 (load "loaddefs.el") ;; In case loaddefs hasn't been generated yet. - (file-error (load "ldefs-boot-manual.el"))) + (file-error (load "ldefs-boot.el"))) (let ((new (make-hash-table :test 'equal))) ;; Now that loaddefs has populated definition-prefixes, purify its contents. |