(describe-function-1): If the source is `loaddefs.el', look for the

real source.  This is necessary only for defaliases.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 87af273b9f84e1233814dc66e6c46dfc55c0010b..86f41c86ac91145dfd89bc31cc6b4a43ff8186d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,15 @@
 
 2002-05-08  Markus Rost  <rost@math.ohio-state.edu>
 
+       * help-fns.el (describe-function-1): If the source is
+       `loaddefs.el', look for the real source.  This is necessary only
+       for defaliases.
+
+       * emacs-lisp/find-func.el (find-function-search-for-symbol): Add
+       autoload cookie.
+       (find-function-regexp):  Include
+       "\(quote " to match the defaliases in loaddefs.el.
+
        * filesets.el (filesets-conditional-sort): Use copy-sequence, not
        copy-list.
        (filesets-menu-path, filesets-menu-before, filesets-menu-in-menu):

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e27e6fc119a11c2d81f693f8ba16a35336552d77..af0fa9e73a9abde5b86b0805bdc797ef3bbd0a14 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -210,6 +210,19 @@ and the file name is displayed in the echo area."
              (help-xref-button 1 'help-function def)))))
     (or file-name
        (setq file-name (symbol-file function)))
+    (when (equal file-name "loaddefs.el")
+      ;; Find the real def site of the preloaded function.
+      ;; This is necessary only for defaliases.
+      (let ((location
+            (condition-case nil
+                (find-function-search-for-symbol function nil "loaddefs.el") 
+              (error nil))))
+       (when location
+         (with-current-buffer (car location)
+           (goto-char (cdr location))
+           (when (re-search-backward
+                  "^;;; Generated autoloads from \\(.*\\)" nil t)
+             (setq file-name (match-string 1)))))))
     (cond
      (file-name
       (princ " in `")