mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-18 18:05:07 +00:00
Code Issues Releases Activity

* loadup.el (load-prefer-newer): Set non-nil when dumping.

Browse Source 
--eval doesn't work (or not early enough) during dumping.
Making load-prefer-newer non-nil by default would be simpler...

Fixes: debbugs:17629
This commit is contained in:
Glenn Morris 2014-05-31 19:36:40 -07:00
parent b5d6fe3bf6
commit a383d0913e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2014-06-01 Glenn Morris <rgm@gnu.org>
* loadup.el (load-prefer-newer): Set non-nil when dumping. (Bug#17629)
2014-05-31 Glenn Morris <rgm@gnu.org>
* files.el (locate-dominating-file): Expand file argument. (Bug#17641)

15
lisp/loadup.el
View File

@ -72,9 +72,12 @@
;; This is a poor man's `last', since we haven't loaded subr.el yet.
(if (or (equal (member "bootstrap" command-line-args) '("bootstrap"))
(equal (member "dump" command-line-args) '("dump")))
;; To reduce the size of dumped Emacs, we avoid making huge
;; char-tables.
(setq inhibit-load-charset-map t))
(progn
;; To reduce the size of dumped Emacs, we avoid making huge char-tables.
(setq inhibit-load-charset-map t)
;; --eval gets handled too late.
(defvar load--prefer-newer load-prefer-newer)
(setq load-prefer-newer t)))
;; We don't want to have any undo records in the dumped Emacs.
(set-buffer "*scratch*")
@ -358,6 +361,12 @@ lost after dumping")))
(remove-hook 'after-load-functions (lambda (f) (garbage-collect)))
(if (boundp 'load--prefer-newer)
(progn
(setq load-prefer-newer load--prefer-newer)
(put 'load-prefer-newer 'standard-value load--prefer-newer)
(makunbound 'load--prefer-newer)))
(setq inhibit-load-charset-map nil)
(clear-charset-maps)
(garbage-collect)