[Emacs-diffs] Changes to emacs/lisp/help-fns.el

[Richard M . Stallman]

Index: emacs/lisp/help-fns.el
diff -c emacs/lisp/help-fns.el:1.62 emacs/lisp/help-fns.el:1.63
*** emacs/lisp/help-fns.el:1.62 Wed Jan  5 01:09:23 2005
--- emacs/lisp/help-fns.el      Fri Jan  7 16:12:34 2005
***************
*** 216,221 ****
--- 216,229 ----
                        (intern (upcase name))))))
                arglist)))
  
+ ;;; Could be this, if we make symbol-file do the work below.
+ ;;; (defun help-C-file-name (subr-or-var kind)
+ ;;;   "Return the name of the C file where SUBR-OR-VAR is defined.
+ ;;; KIND should be `var' for a variable or `subr' for a subroutine."
+ ;;;   (symbol-file (if (symbolp subr-or-var) subr-or-var
+ ;;;            (subr-name subr-or-var))
+ ;;;          (if (eq kind 'var) 'defvar 'defun)))
+ 
  (defun help-C-file-name (subr-or-var kind)
    "Return the name of the C file where SUBR-OR-VAR is defined.
  KIND should be `var' for a variable or `subr' for a subroutine."
***************
*** 231,238 ****
        (let ((file (catch 'loop
                    (while t
                      (let ((pnt (search-forward (concat "" name "\n"))))
!       (re-search-backward "S\\(.*\\)")
!       (let ((file (match-string 1)))
                          (if (member file build-files)
                              (throw 'loop file)
                            (goto-char pnt))))))))
--- 239,246 ----
        (let ((file (catch 'loop
                    (while t
                      (let ((pnt (search-forward (concat "" name "\n"))))
!                       (re-search-backward "S\\(.*\\)")
!                       (let ((file (match-string 1)))
                          (if (member file build-files)
                              (throw 'loop file)
                            (goto-char pnt))))))))