[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/raeburn-startup ea962a8 4/7: Load uniquify after d
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] scratch/raeburn-startup ea962a8 4/7: Load uniquify after dump/reload. |
Date: |
Tue, 30 May 2017 04:53:33 -0400 (EDT) |
branch: scratch/raeburn-startup
commit ea962a81c38ba62f790de461d6c3c4d5f6bbf457
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 19ad5d3..0d67323 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -314,7 +314,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)
@@ -505,12 +504,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!
@@ -683,6 +678,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.
@@ -717,6 +714,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.
- [Emacs-diffs] scratch/raeburn-startup updated (d38cc1a -> 143492e), Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup 04ef26e 1/7: Suppress some dump-related Lea-malloc calls., Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup ddae7c3 3/7: Allow dumping of elisp--xref-identifier-completion-table., Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup ea962a8 4/7: Load uniquify after dump/reload.,
Ken Raeburn <=
- [Emacs-diffs] scratch/raeburn-startup 2653005 5/7: Support dumping variable aliases., Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup a6adefd 2/7: Clear out doc strings matching DOC file before dumping., Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup 7b8795b 6/7: Retain overlay properties when dumping., Ken Raeburn, 2017/05/30
- [Emacs-diffs] scratch/raeburn-startup 143492e 7/7: ; admin/notes/big-elc: Notes on this experimental branch., Ken Raeburn, 2017/05/30