2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b410c68015c..85574e28651 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-06  Richard Stallman  <rms@gnu.org>
+
+        * help-fns.el (describe-function-1): Call ad-get-advice-info
+        only on symbols.
+
 2007-12-06  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/antlr-mode.el (antlr-keyword, antlr-syntax)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 5aa8860ae9d..a8350bf0445 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -252,7 +252,8 @@ face (according to `face-differs-from-default-p')."
 
 ;;;###autoload
 (defun describe-function-1 (function)
-  (let* ((advised (and (featurep 'advice) (ad-get-advice-info function)))
+  (let* ((advised (and (symbolp function) (featurep 'advice)
+                       (ad-get-advice-info function)))
          ;; If the function is advised, use the symbol that has the
          ;; real definition, if that symbol is already set up.
          (real-function