From 9192f5d25b26788d74b5ba2eb18f244e03669686 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 24 Jul 2021 13:46:02 +0200
Subject: [PATCH] Make 's' in *Help* work for Lisp-defined variables again

* lisp/help-fns.el (describe-variable): Make the `s' command work
for Lisp-defined variables again (bug#39121).
---
 lisp/help-fns.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 7641774615d..d7fb038f45a 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1078,7 +1078,9 @@ it is displayed along with the global value."
 		           (with-current-buffer standard-output
                              (setq help-mode--current-data
                                    (list :symbol variable
-                                         :type 'variable
+                                         :type (if (eq file-name 'C-source)
+                                                   'variable
+                                                 'defvar)
                                          :file file-name))
                              (save-excursion
 			       (re-search-backward (substitute-command-keys
-- 
2.39.2