From c1e8fc3069ca43a34ee5af845e47bc9cfbf8a877 Mon Sep 17 00:00:00 2001 From: "Jacob S. Gordon" Date: Wed, 8 Oct 2025 14:55:36 -0400 Subject: [PATCH] ; Add missing defcustom types in eshell and eww (bug#79607) * lisp/eshell/esh-mode.el (eshell-scroll-to-bottom-on-input) (eshell-scroll-to-bottom-on-output): Add t as a choice. * lisp/net/eww.el (eww-restore-desktop): Add 'auto' as a choice. --- lisp/eshell/esh-mode.el | 10 ++++++++-- lisp/net/eww.el | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 15dfd90dd8a..b41f7aa9055 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -128,7 +128,10 @@ buffer. If `this', scroll only the selected window. See `eshell-preinput-scroll-to-bottom'." :type '(radio (const :tag "Do not scroll Eshell windows" nil) - (const :tag "Scroll all windows showing the buffer" all) + (choice :tag "Scroll all windows showing the buffer" + :value all + (const t) + (const all)) (const :tag "Scroll only the selected window" this))) (defcustom eshell-scroll-to-bottom-on-output nil @@ -140,7 +143,10 @@ scroll only those that are not the selected window. See variable `eshell-scroll-show-maximum-output' and function `eshell-postoutput-scroll-to-bottom'." :type '(radio (const :tag "Do not scroll Eshell windows" nil) - (const :tag "Scroll all windows showing the buffer" all) + (choice :tag "Scroll all windows showing the buffer" + :value all + (const t) + (const all)) (const :tag "Scroll only the selected window" this) (const :tag "Scroll all windows other than selected" others))) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 666a5025c2c..7d7373b275e 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -148,7 +148,9 @@ If nil, buffers will require manual reload, and will contain the text specified in `eww-restore-reload-prompt' instead of the actual Web page contents." :version "25.1" - :type '(choice (const :tag "Restore all automatically" t) + :type '(choice (choice :tag "Restore all automatically" :value t + (const t) + (const auto)) (const :tag "Require manual reload" nil))) (defcustom eww-restore-reload-prompt