diff options
| author | Glenn Morris | 2018-01-16 20:55:20 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-01-16 20:55:20 -0500 |
| commit | f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe (patch) | |
| tree | b7aa829dc5342d5465e0d627c459ce83f75ba985 | |
| parent | 5b776bfd644e779f65d631eea5b5017cb97af1a9 (diff) | |
| download | emacs-f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe.tar.gz emacs-f4e6b6e0771b03855b0772bcbd55a22e8cdda2fe.zip | |
Small startup fix for current-load-list
* lisp/startup.el (command-line):
Avoid current-load-list being non-nil after startup ends.
| -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") | |||
| 1090 | 1090 | ||
| 1091 | ;; Re-evaluate predefined variables whose initial value depends on | 1091 | ;; Re-evaluate predefined variables whose initial value depends on |
| 1092 | ;; the runtime context. | 1092 | ;; the runtime context. |
| 1093 | (mapc 'custom-reevaluate-setting | 1093 | (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH |
| 1094 | ;; Initialize them in the same order they were loaded, in case there | 1094 | (mapc 'custom-reevaluate-setting |
| 1095 | ;; are dependencies between them. | 1095 | ;; Initialize them in the same order they were loaded, in case there |
| 1096 | (prog1 (nreverse custom-delayed-init-variables) | 1096 | ;; are dependencies between them. |
| 1097 | (setq custom-delayed-init-variables nil))) | 1097 | (prog1 (nreverse custom-delayed-init-variables) |
| 1098 | (setq custom-delayed-init-variables nil)))) | ||
| 1098 | 1099 | ||
| 1099 | (normal-erase-is-backspace-setup-frame) | 1100 | (normal-erase-is-backspace-setup-frame) |
| 1100 | 1101 | ||