From: Dmitry Gutov <dmitry@gutov.dev>
Date: Sun, 6 Oct 2024 13:30:40 +0000 (+0300)
Subject: help-setup-xref: Simplify further
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ff538058a5f3029907a15aefcf6c76c2b8d2887;p=emacs.git

help-setup-xref: Simplify further

* lisp/help-mode.el (help-setup-xref): Simplify, given that the
vars are marked 'permanent-local' already (bug#73637).

(cherry picked from commit 61c91389a4da90645562a8b80858e62b7526cdd6)
---

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index ec69a392a96..ff32af9f344 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -510,19 +510,15 @@ This should be called very early, before the output buffer is cleared,
 because we want to record the \"previous\" position of point so we can
 restore it properly when going back."
   (with-current-buffer (help-buffer)
-    (let ((stack-item help-xref-stack-item)
-          (stack help-xref-stack))
-      (kill-all-local-variables)
-      (setq help-xref-stack-item stack-item
-            help-xref-stack stack)
-      (when help-xref-stack-item
-        (push (cons (point) help-xref-stack-item) help-xref-stack)
-        (setq help-xref-forward-stack nil))
-      (when interactive-p
-        (let ((tail (nthcdr 10 help-xref-stack)))
-      ;; Truncate the stack.
-      (if tail (setcdr tail nil))))
-      (setq help-xref-stack-item item))))
+    (kill-all-local-variables)
+    (when help-xref-stack-item
+      (push (cons (point) help-xref-stack-item) help-xref-stack)
+      (setq help-xref-forward-stack nil))
+    (when interactive-p
+      (let ((tail (nthcdr 10 help-xref-stack)))
+        ;; Truncate the stack.
+        (if tail (setcdr tail nil))))
+    (setq help-xref-stack-item item)))
 
 (defvar help-xref-following nil
   "Non-nil when following a help cross-reference.")