[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f2f9e8dc76: ; Improve comments for a recently installed bugfix
From: |
Eli Zaretskii |
Subject: |
master f2f9e8dc76: ; Improve comments for a recently installed bugfix |
Date: |
Fri, 22 Apr 2022 08:19:55 -0400 (EDT) |
branch: master
commit f2f9e8dc76cdc7433624ee7e88ec5380a5b06902
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; Improve comments for a recently installed bugfix
* lisp/startup.el (command-line): Remove references to a wrong bug
number and improve comments for delaying the 'user-emacs-directory'
warning. (Bug#25163)
---
lisp/startup.el | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/lisp/startup.el b/lisp/startup.el
index 4391fdd996..57a38a295e 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1291,9 +1291,11 @@ please check its value")
(setcdr command-line-args args)))
;; Re-evaluate predefined variables whose initial value depends on
- ;; the runtime context.
- (let ((user-emacs-directory-warning nil)) ; Delay showing this
- ; warning (Bug#25162).
+ ;; the runtime context. But delay the warning about
+ ;; `user-emacs-directory' being inaccessible until after processing
+ ;; the init file and the command-line arguments, in case the user
+ ;; customized `user-emacs-directory-warning' to nil via those.
+ (let ((user-emacs-directory-warning nil))
(when (listp custom-delayed-init-variables)
(mapc #'custom-reevaluate-setting
;; Initialize them in the same order they were loaded, in
@@ -1559,14 +1561,17 @@ please check its value")
(list 'error
(substitute-command-keys "Memory exhausted--use
\\[save-some-buffers] then exit and restart Emacs")))
- ;; Reevaluate `user-emacs-directory-warning' before process '--eval'
- ;; args, so that the user can override that default (Bug#25162).
+ ;; Reevaluate `user-emacs-directory-warning' before processing
+ ;; '--eval' arguments, so that the user could override the default
+ ;; value in the '--eval' forms.
(custom-reevaluate-setting 'user-emacs-directory-warning)
;; Process the remaining args.
(command-line-1 (cdr command-line-args))
- ;; Check if `user-emacs-directory' is accessible (Bug#25162).
+ ;; Check if `user-emacs-directory' is accessible and warn if it
+ ;; isn't, unless `user-emacs-directory-warning' was customized to
+ ;; disable that warning.
(when (and user-emacs-directory-warning
(not (file-accessible-directory-p user-emacs-directory)))
(locate-user-emacs-file ""))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master f2f9e8dc76: ; Improve comments for a recently installed bugfix,
Eli Zaretskii <=