Don't ignore display-warning customization for initial frame too

* lisp/emacs-lisp/warnings.el (display-warning): Take into account
'warning-minimum-level' and 'warning-suppress-types' also in case of
displaying daemon startup warnings on the first client frame (bug#81694).
This commit is contained in:
Juri Linkov 2026-08-25 18:17:50 +03:00
parent 57ad5ab8f7
commit 80671b1c49

View file

@ -372,7 +372,13 @@ entirely by setting `warning-suppress-types' or
(if (bolp) (if (bolp)
(forward-char -1)) (forward-char -1))
(message "%s" (buffer-substring start (point)))))) (message "%s" (buffer-substring start (point))))))
;; Use `frame-initial-p'? ;; Interactively, decide whether the warning merits display.
((or (< (warning-numeric-level level)
(warning-numeric-level warning-minimum-level))
(warning-suppress-p type warning-suppress-types))
;; Don't display the warning.
nil)
;; Use `frame-initial-p'?
((and (daemonp) (eq (selected-frame) terminal-frame)) ((and (daemonp) (eq (selected-frame) terminal-frame))
;; Display daemon startup warnings on the first client frame. ;; Display daemon startup warnings on the first client frame.
(letrec ((afterfun (letrec ((afterfun
@ -391,12 +397,8 @@ entirely by setting `warning-suppress-types' or
(forward-char -1)) (forward-char -1))
(buffer-substring start (point)))))) (buffer-substring start (point))))))
(t (t
;; Interactively, decide whether the warning merits ;; Display immediately.
;; immediate display. (warning--display-buffer buffer)))))))
(or (< (warning-numeric-level level)
(warning-numeric-level warning-minimum-level))
(warning-suppress-p type warning-suppress-types)
(warning--display-buffer buffer))))))))
(defun warning--display-buffer (buffer) (defun warning--display-buffer (buffer)
(let ((window (display-buffer (let ((window (display-buffer