[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6d70161 1/2: Revert "Recompute user-emacs-directory
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 6d70161 1/2: Revert "Recompute user-emacs-directory-relative defcustoms one more time" |
Date: |
Sat, 24 Aug 2019 09:46:07 -0400 (EDT) |
branch: master
commit 6d70161de6f675a1cf8257da231845189ce19793
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Revert "Recompute user-emacs-directory-relative defcustoms one more time"
This reverts commit bb5cd7c4caf415e40836edbbc4e62b0dd411d73f.
See bug#37173.
---
lisp/startup.el | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/lisp/startup.el b/lisp/startup.el
index ff90646..5644285 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -406,7 +406,6 @@ if you have not already set `auto-save-list-file-name'
yourself.
Directories in the prefix will be created if necessary.
Set this to nil if you want to prevent `auto-save-list-file-name'
from being initialized."
- :initialize 'custom-initialize-delay
:type '(choice (const :tag "Don't record a session's auto save list" nil)
string)
:group 'auto-save)
@@ -1283,7 +1282,8 @@ please check its value")
;; depends on the runtime context, in case some of them depend on
;; the window-system features. Example: blink-cursor-mode.
(let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH
- (mapc 'custom-reevaluate-setting custom-delayed-init-variables))
+ (mapc 'custom-reevaluate-setting custom-delayed-init-variables)
+ (setq custom-delayed-init-variables nil))
(normal-erase-is-backspace-setup-frame)
@@ -1377,14 +1377,6 @@ please check its value")
(eq face-ignored-fonts old-face-ignored-fonts))
(clear-face-cache)))
- ;; Re-evaluate again the predefined variables whose initial value
- ;; depends on the runtime context, in case the user init file
- ;; modified user-emacs-directory. Examples: abbrev-file-name,
- ;; auto-save-list-file-prefix.
- (let (current-load-list) ; c-r-s may call defvar, and hence LOADHIST_ATTACH
- (mapc 'custom-reevaluate-setting custom-delayed-init-variables)
- (setq custom-delayed-init-variables nil))
-
(setq after-init-time (current-time))
;; Display any accumulated warnings after all functions in
;; `after-init-hook' like `desktop-read' have finalized possible
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6d70161 1/2: Revert "Recompute user-emacs-directory-relative defcustoms one more time",
Eli Zaretskii <=