From 274fcfa8508dd50a975aa891ee9376e389a1af19 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 30 Jun 2022 12:35:55 +0200 Subject: [PATCH] Restore temp-buffer-resize-mode behaviour wrt. [back] buttons * lisp/help.el (help--window-setup): If temp-buffer-resize-mode, do the window setup after adding [back] buttons (bug#56306). --- lisp/help.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/help.el b/lisp/help.el index fbcf8461e61..d7ee1a84a43 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1999,8 +1999,10 @@ The `temp-buffer-window-setup-hook' hook is called." (prog1 (funcall callback) (run-hooks 'temp-buffer-window-setup-hook))) - (help-window-setup (temp-buffer-window-show (current-buffer))) - (help-make-xrefs (current-buffer)))))) + (help-make-xrefs (current-buffer)) + ;; This must be done after the buffer has been completely + ;; generated, since `temp-buffer-resize-mode' may be enabled. + (help-window-setup (temp-buffer-window-show (current-buffer))))))) ;; Called from C, on encountering `help-char' when reading a char. ;; Don't print to *Help*; that would clobber Help history.