Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 91238:5cf14a2107b5 | 91239:2fcaae6177a5 |
|---|---|
| 250 | 250 |
| 251 (declare-function ad-get-advice-info "advice" (function)) | 251 (declare-function ad-get-advice-info "advice" (function)) |
| 252 | 252 |
| 253 ;;;###autoload | 253 ;;;###autoload |
| 254 (defun describe-function-1 (function) | 254 (defun describe-function-1 (function) |
| 255 (let* ((advised (and (featurep 'advice) (ad-get-advice-info function))) | 255 (let* ((advised (and (symbolp function) (featurep 'advice) |
| 256 (ad-get-advice-info function))) | |
| 256 ;; If the function is advised, use the symbol that has the | 257 ;; If the function is advised, use the symbol that has the |
| 257 ;; real definition, if that symbol is already set up. | 258 ;; real definition, if that symbol is already set up. |
| 258 (real-function | 259 (real-function |
| 259 (or (and advised | 260 (or (and advised |
| 260 (cdr (assq 'origname advised)) | 261 (cdr (assq 'origname advised)) |