* help-fns.el (help-C-file-name): File name must be in build-files

to be returned.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 767b00eae77966062d87b63ae3d78e96a50d20fa..90dcebcc23ec3d0d28b531fed60f2ed969ff0805 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-09  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * help-fns.el (help-C-file-name): File name must be in build-files
+       to be returned.
+
 2004-11-09  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc.el (calc-mode-hook, calc-trail-mode-hook)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 8f2a1b7fa6e4ad2181150e1e61c5523d4107c748..c06a7b1ee73aac1be69a388fbf2d364d3fe59ffc 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -228,9 +228,14 @@ KIND should be `var' for a variable or `subr' for a subroutine."
       (if (eobp)
          (insert-file-contents-literally
           (expand-file-name internal-doc-file-name doc-directory)))
-      (search-forward (concat "\1f" name "\n"))
+      (let ((file (catch 'loop
+                   (while t
+                     (let ((pnt (search-forward (concat "\1f" name "\n"))))
       (re-search-backward "\1fS\\(.*\\)")
       (let ((file (match-string 1)))
+                         (if (member file build-files)
+                             (throw 'loop file)
+                           (goto-char pnt))))))))
        (if (string-match "\\.\\(o\\|obj\\)\\'" file)
            (setq file (replace-match ".c" t t file)))
        (if (string-match "\\.c\\'" file)