diff options
author | Glenn Morris <rgm@gnu.org> | 2018-01-16 20:55:20 -0500 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2018-01-16 20:55:20 -0500 |
commit | f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe (patch) | |
tree | b7aa829dc5342d5465e0d627c459ce83f75ba985 /lisp/startup.el | |
parent | 5b776bfd644e779f65d631eea5b5017cb97af1a9 (diff) | |
download | emacs-f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe.tar.gz |
Small startup fix for current-load-list
* lisp/startup.el (command-line):
Avoid current-load-list being non-nil after startup ends.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r-- | lisp/startup.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 6001dc9a07b..9d16b59defd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1090,11 +1090,12 @@ please check its value") ;; Re-evaluate predefined variables whose initial value depends on ;; the runtime context. - (mapc 'custom-reevaluate-setting - ;; Initialize them in the same order they were loaded, in case there - ;; are dependencies between them. - (prog1 (nreverse custom-delayed-init-variables) - (setq custom-delayed-init-variables nil))) + (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH + (mapc 'custom-reevaluate-setting + ;; Initialize them in the same order they were loaded, in case there + ;; are dependencies between them. + (prog1 (nreverse custom-delayed-init-variables) + (setq custom-delayed-init-variables nil)))) (normal-erase-is-backspace-setup-frame) |