# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265686550 21600
# Node ID d6368048cd8c94321ef4af695289ee0c2e0aded3
# Parent  2ade80e8c6403fed41281332317baaef0762233e
remove bogus usage of annotations from help.el

-------------------- ChangeLog entries follow: --------------------

lisp/ChangeLog addition:

2010-02-08  Ben Wing  <ben@xemacs.org>

	* help.el (describe-function-1):
	Don't use compiled-function-annotation to retrieve the file name
	for a function since it doesn't provide this info and load-history
	already does provide it.

diff -r 2ade80e8c640 -r d6368048cd8c lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Feb 08 21:28:57 2010 -0600
+++ b/lisp/ChangeLog	Mon Feb 08 21:35:50 2010 -0600
@@ -1,3 +1,10 @@
+2010-02-08  Ben Wing  <ben@xemacs.org>
+
+	* help.el (describe-function-1):
+	Don't use compiled-function-annotation to retrieve the file name
+	for a function since it doesn't provide this info and load-history
+	already does provide it.
+
 2010-02-06  Ben Wing  <ben@xemacs.org>
 
 	* unicode.el:
diff -r 2ade80e8c640 -r d6368048cd8c lisp/help.el
--- a/lisp/help.el	Mon Feb 08 21:28:57 2010 -0600
+++ b/lisp/help.el	Mon Feb 08 21:35:50 2010 -0600
@@ -1385,15 +1385,8 @@
 			   (symbol-name def)))
 		(format "an alias for `%s', " (symbol-name def)))))
       (setq def (symbol-function def)))
-    (if (and (fboundp 'compiled-function-annotation)
-	     (compiled-function-p def))
-	(setq file-name (declare-fboundp (compiled-function-annotation def))))
     (if (eq 'macro (car-safe def))
 	(setq fndef (cdr def)
-	      file-name (and (compiled-function-p (cdr def))
-			     (fboundp 'compiled-function-annotation)
-			     (declare-fboundp
-			      (compiled-function-annotation (cdr def))))
 	      macrop t)
       (setq fndef def))
     (if aliases (princ aliases))