[Emacs-diffs] trunk r117209: * loadup.el (load-prefer-newer): Set non-nil when dumping.

[Glenn Morris]

------------------------------------------------------------
revno: 117209
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17629
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-05-31 19:36:40 -0700
message:
  * loadup.el (load-prefer-newer): Set non-nil when dumping. 
  --eval doesn't work (or not early enough) during dumping.
  Making load-prefer-newer non-nil by default would be simpler...
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/loadup.el                 loadup.el-20091113204419-o5vbwnq5f7feedwu-49

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-31 02:27:22 +0000
+++ b/lisp/ChangeLog    2014-06-01 02:36:40 +0000
@@ -1,3 +1,7 @@
+2014-06-01  Glenn Morris  <address@hidden>
+
+       * loadup.el (load-prefer-newer): Set non-nil when dumping.  (Bug#17629)
+
 2014-05-31  Glenn Morris  <address@hidden>
 
        * files.el (locate-dominating-file): Expand file argument.  (Bug#17641)

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2014-05-30 23:50:09 +0000
+++ b/lisp/loadup.el    2014-06-01 02:36:40 +0000
@@ -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 @@
 
 (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)