Mercurial > emacs
diff lisp/help-fns.el @ 91239:2fcaae6177a5
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 16 Dec 2007 05:08:49 +0000 |
| parents | 53108e6cea98 12a53ee55069 |
| children | 606f2d163a64 |
line wrap: on
line diff
--- a/lisp/help-fns.el Fri Dec 14 12:53:04 2007 +0000 +++ b/lisp/help-fns.el Sun Dec 16 05:08:49 2007 +0000 @@ -252,7 +252,8 @@ ;;;###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