[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6e9f20b: Small cus-start fix for custom-delayed-ini
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 6e9f20b: Small cus-start fix for custom-delayed-init-variables |
Date: |
Tue, 16 Jan 2018 21:20:54 -0500 (EST) |
branch: master
commit 6e9f20b3ff49adfc05a7f4b49b1b92daa4fb1ca9
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Small cus-start fix for custom-delayed-init-variables
* lisp/cus-start.el (custom-delayed-init-variables):
Only modify it during startup.
---
lisp/cus-start.el | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index dace6f7..4529fa1 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."
(put symbol 'risky-local-variable (cadr prop)))
(if (setq prop (memq :set rest))
(put symbol 'custom-set (cadr prop)))
- ;; Note this is the _only_ initialize property we handle.
- (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
- ;; These vars are defined early and should hence be initialized
- ;; early, even if this file happens to be loaded late. so add them
- ;; to the end of custom-delayed-init-variables. Otherwise,
- ;; auto-save-file-name-transforms will appear in M-x customize-rogue.
- (add-to-list 'custom-delayed-init-variables symbol 'append))
+ ;; Don't re-add to custom-delayed-init-variables post-startup.
+ (unless after-init-time
+ ;; Note this is the _only_ initialize property we handle.
+ (if (eq (cadr (memq :initialize rest)) 'custom-initialize-delay)
+ ;; These vars are defined early and should hence be initialized
+ ;; early, even if this file happens to be loaded late. so add them
+ ;; to the end of custom-delayed-init-variables. Otherwise,
+ ;; auto-save-file-name-transforms will appear in customize-rogue.
+ (add-to-list 'custom-delayed-init-variables symbol 'append)))
;; If this is NOT while dumping Emacs, set up the rest of the
;; customization info. This is the stuff that is not needed
;; until someone does M-x customize etc.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6e9f20b: Small cus-start fix for custom-delayed-init-variables,
Glenn Morris <=