[Emacs-diffs] scratch/raeburn-startup bd8bcb3 29/43: Load uniquify after dump/reload.

[Ken Raeburn]

branch: scratch/raeburn-startup
commit bd8bcb37ab2070aa5c3c66f385cbe009f13a5379
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>

    Load uniquify after dump/reload.
    
    * lisp/loadup.el: Don't load uniquify before dumping; load it if we
    don't dump, or if we do dump, write out instructions to load it at
    startup.  Don't explicitly filter out rename-buffer when checking for
    function definitions that need writing out.
---
 lisp/loadup.el | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lisp/loadup.el b/lisp/loadup.el
index aeba14a..e3d8dc5 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -320,7 +320,6 @@
 
 (load "vc/vc-hooks")
 (load "vc/ediff-hook")
-(load "uniquify")
 (load "electric")
 (load "emacs-lisp/eldoc")
 (load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway)
@@ -513,12 +512,8 @@ lost after dumping")))
                  ;; subr objects aren't readable!
                  (unless (equal (symbol-name s) (subr-name (symbol-function 
s)))
                    (push `(fset ',s (symbol-function ',(intern (subr-name 
(symbol-function s))))) cmds))
-               (if (memq s '(rename-buffer))
-                   ;; FIXME: We need these, but they contain
-                   ;; unprintable objects.
-                   nil
-                 (push `(fset ',s ,(macroexp-quote (symbol-function s)))
-                       cmds))))
+               (push `(fset ',s ,(macroexp-quote (symbol-function s)))
+                     cmds)))
            (when (and (default-boundp s)
                       (not (macroexp--const-symbol-p s 'any-value))
                       ;; I think we don't need/want these!
@@ -691,6 +686,8 @@ lost after dumping")))
                                      'face-defface-spec)))
             (terpri)
             (print '(load "international/characters" nil t))
+            ;; This sets advice on a subr, so cannot be preloaded.
+            (print '(load "uniquify"))
             (terpri)
             ;; Lisp functions have their DOC file offsets stored
             ;; already, but for a subr it's hidden away from Lisp.
@@ -725,6 +722,8 @@ lost after dumping")))
 
       (kill-emacs)))
 
+(load "uniquify")
+
 ;; For machines with CANNOT_DUMP defined in config.h,
 ;; this file must be loaded each time Emacs is run.
 ;; So run the startup code now.  First, remove `-l loadup' from args.