From: Eshel Yaron <me@eshelyaron.com>
Date: Thu, 23 May 2024 13:02:05 +0000 (+0200)
Subject: Fix 'help-view-source' for variables defined in C
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~1385
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=52acabcbe8eeb688640e18884ba8a15635ca7062;p=emacs.git

Fix 'help-view-source' for variables defined in C

This fixes an issue that Juri Linkov mentioned in Bug#71117.

* lisp/help-mode.el (help-function-def--button-function): When
searching for the definition of a variable, make sure to call
'help-C-file-name' with KIND argument set to 'var'.
---

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 48433d899ab..e16408be7b0 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -265,7 +265,9 @@ The format is (FUNCTION ARGS...).")
     (require 'find-func)
     (when (eq file 'C-source)
       (setq file
-            (help-C-file-name (indirect-function fun) 'fun)))
+            (if (memq type '(variable defvar))
+                (help-C-file-name fun 'var)
+              (help-C-file-name (indirect-function fun) 'fun))))
     ;; Don't use find-function-noselect because it follows
     ;; aliases (which fails for built-in functions).
     (let* ((location