bug#72521: [PATCH]: lisp/help-macro.el: remove hard-coded variable-pitch-mode

[Paul W. Rankin via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 644 bytes --]


> On 8 Aug 2024, at 18:58, Eli Zaretskii <eliz@gnu.org> wrote:
> 
> Thanks, but we cannot possible install this patch, since this behavior
> was introduced in Emacs 29.  I agree with making this feature
> optional, of course (and it will then be ON by default), but your
> patch doesn't do that.

Hi Eli,

Thanks. I’ve replaced the call to variable-pitch-mode with a hook, 
help-screen-hook, which defaults to calling variable-pitch-mode.

Ideally I think this should just be help-mode-hook though, which of 
course should not default to calling variable-pitch-mode.

Anyway, how’s the patch (now attached) look to you?


[-- Attachment #2: 0001-lisp-help-macro.el-add-help-screen-hook.patch --]
[-- Type: application/octet-stream, Size: 1520 bytes --]

From 24b8ab0bd7b937b46d6faad05821b462019732cc Mon Sep 17 00:00:00 2001
From: "Paul W. Rankin" <rnkn@rnkn.xyz>
Date: Thu, 8 Aug 2024 12:16:07 +1000
Subject: [PATCH] * lisp/help-macro.el: add help-screen-hook

help-screen-hook by default calls variable-pitch-mode for backwards
compatibility with Emacs 29
---
 lisp/help-macro.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 14d2a45f5f2..fce8f784076 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -78,6 +78,13 @@ three-step-help
   :type 'boolean
   :group 'help)
 
+(defcustom help-screen-hook
+  '(variable-pitch-mode)
+  "Hook run by `make-help-screen', called by command `help-for-help'."
+  :options '(variable-pitch-mode)
+  :type 'hook
+  :group 'help)
+
 (defmacro make-help-screen (fname help-line help-text helped-map
                                   &optional buffer-name)
   "Construct help-menu function name FNAME.
@@ -141,7 +148,7 @@ make-help-screen
                    (insert (substitute-command-keys help-screen)))
                  (let ((minor-mode-map-alist new-minor-mode-map-alist))
                    (help-mode)
-                   (variable-pitch-mode)
+                   (run-hooks 'help-screen-hook)
                    (setq new-minor-mode-map-alist minor-mode-map-alist))
                  (goto-char (point-min))
                  (while (or (memq char (append help-event-list
-- 
2.39.3 (Apple Git-146)