[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/raeburn-startup 5cd1910 1/5: Update load-path and
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] scratch/raeburn-startup 5cd1910 1/5: Update load-path and purify-flag even if not bootstrapping. |
Date: |
Mon, 10 Apr 2017 11:59:12 -0400 (EDT) |
branch: scratch/raeburn-startup
commit 5cd1910927ba5e495eea9ffc3918323c61ce8f85
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>
Update load-path and purify-flag even if not bootstrapping.
* lisp/loadup.el: Always update load-path and purify-flag.
---
lisp/loadup.el | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 94d1a40..9e0d50f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -57,6 +57,17 @@
;; Add subdirectories to the load-path for files that might get
;; autoloaded when bootstrapping.
;; This is because PATH_DUMPLOADSEARCH is just "../lisp".
+(let ((dir (car load-path)))
+ (message "load path is %S" load-path)
+ (setq load-path (list (expand-file-name "." dir)
+ (expand-file-name "emacs-lisp" dir)
+ (expand-file-name "language" dir)
+ (expand-file-name "international" dir)
+ (expand-file-name "textmodes" dir)
+ (expand-file-name "vc" dir))))
+
+(setq purify-flag nil)
+
(if (or (equal (member "bootstrap" command-line-args) '("bootstrap"))
;; FIXME this is irritatingly fragile.
(equal (nth 4 command-line-args) "unidata-gen.el")
@@ -64,19 +75,10 @@
(if (fboundp 'dump-emacs)
(string-match "src/bootstrap-emacs" (nth 0 command-line-args))
t))
- (let ((dir (car load-path)))
- ;; We'll probably overflow the pure space.
- (setq purify-flag nil)
- ;; Value of max-lisp-eval-depth when compiling initially.
- ;; During bootstrapping the byte-compiler is run interpreted when
- ;; compiling itself, which uses a lot more stack than usual.
- (setq max-lisp-eval-depth 2200)
- (setq load-path (list (expand-file-name "." dir)
- (expand-file-name "emacs-lisp" dir)
- (expand-file-name "language" dir)
- (expand-file-name "international" dir)
- (expand-file-name "textmodes" dir)
- (expand-file-name "vc" dir)))))
+ ;; Value of max-lisp-eval-depth when compiling initially.
+ ;; During bootstrapping the byte-compiler is run interpreted when
+ ;; compiling itself, which uses a lot more stack than usual.
+ (setq max-lisp-eval-depth 2200))
(if (eq t purify-flag)
;; Hash consing saved around 11% of pure space in my tests.
- [Emacs-diffs] scratch/raeburn-startup updated (6d75508 -> d38cc1a), Ken Raeburn, 2017/04/10
- [Emacs-diffs] scratch/raeburn-startup 100e5b0 2/5: Load cl-macs, needed for cl-labels., Ken Raeburn, 2017/04/10
- [Emacs-diffs] scratch/raeburn-startup d38cc1a 5/5: Write updated loaddefs to a temporary file and rename into place., Ken Raeburn, 2017/04/10
- [Emacs-diffs] scratch/raeburn-startup a4231c3 4/5: Don't dump artifacts of the dump process., Ken Raeburn, 2017/04/10
- [Emacs-diffs] scratch/raeburn-startup 2ccfbba 3/5: Dump and restore empty abbrev tables., Ken Raeburn, 2017/04/10
- [Emacs-diffs] scratch/raeburn-startup 5cd1910 1/5: Update load-path and purify-flag even if not bootstrapping.,
Ken Raeburn <=