diff options
| author | Glenn Morris | 2018-01-16 21:20:43 -0500 |
|---|---|---|
| committer | Glenn Morris | 2018-01-16 21:20:43 -0500 |
| commit | 6e9f20b3ff49adfc05a7f4b49b1b92daa4fb1ca9 (patch) | |
| tree | dedfb8ba78452db48fbc4078e32430933ac07170 | |
| parent | f121b5d7f3aef080d0019eb39a57de51015ceb39 (diff) | |
| download | emacs-6e9f20b3ff49adfc05a7f4b49b1b92daa4fb1ca9.tar.gz emacs-6e9f20b3ff49adfc05a7f4b49b1b92daa4fb1ca9.zip | |
Small cus-start fix for custom-delayed-init-variables
* lisp/cus-start.el (custom-delayed-init-variables):
Only modify it during startup.
| -rw-r--r-- | lisp/cus-start.el | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index dace6f79549..4529fa1ac92 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el | |||
| @@ -705,13 +705,15 @@ since it could result in memory overflow and make Emacs crash." | |||
| 705 | (put symbol 'risky-local-variable (cadr prop))) | 705 | (put symbol 'risky-local-variable (cadr prop))) |
| 706 | (if (setq prop (memq :set rest)) | 706 | (if (setq prop (memq :set rest)) |
| 707 | (put symbol 'custom-set (cadr prop))) | 707 | (put symbol 'custom-set (cadr prop))) |
| 708 | ;; Note this is the _only_ initialize property we handle. | 708 | ;; Don't re-add to custom-delayed-init-variables post-startup. |
| 709 | (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay) | 709 | (unless after-init-time |
| 710 | ;; These vars are defined early and should hence be initialized | 710 | ;; Note this is the _only_ initialize property we handle. |
| 711 | ;; early, even if this file happens to be loaded late. so add them | 711 | (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay) |
| 712 | ;; to the end of custom-delayed-init-variables. Otherwise, | 712 | ;; These vars are defined early and should hence be initialized |
| 713 | ;; auto-save-file-name-transforms will appear in M-x customize-rogue. | 713 | ;; early, even if this file happens to be loaded late. so add them |
| 714 | (add-to-list 'custom-delayed-init-variables symbol 'append)) | 714 | ;; to the end of custom-delayed-init-variables. Otherwise, |
| 715 | ;; auto-save-file-name-transforms will appear in customize-rogue. | ||
| 716 | (add-to-list 'custom-delayed-init-variables symbol 'append))) | ||
| 715 | ;; If this is NOT while dumping Emacs, set up the rest of the | 717 | ;; If this is NOT while dumping Emacs, set up the rest of the |
| 716 | ;; customization info. This is the stuff that is not needed | 718 | ;; customization info. This is the stuff that is not needed |
| 717 | ;; until someone does M-x customize etc. | 719 | ;; until someone does M-x customize etc. |