Mercurial > emacs
changeset 105475:dbbce03200d3
(describe-function-1): Don't burp is the function is not a symbol.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 Oct 2009 19:50:15 +0000 |
| parents | 0a64442c10e3 |
| children | e3bdbd8a2169 |
| files | lisp/ChangeLog lisp/help-fns.el |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 05 15:32:08 2009 +0000 +++ b/lisp/ChangeLog Mon Oct 05 19:50:15 2009 +0000 @@ -1,3 +1,8 @@ +2009-10-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * help-fns.el (describe-function-1): Don't burp is the function is not + a symbol. + 2009-10-05 Juanma Barranquero <lekktu@gmail.com> * emacs-lisp/chart.el (chart-face-pixmap-list, chart-new-buffer, chart) @@ -54,8 +59,8 @@ 2009-10-05 Dan Nicolaescu <dann@ics.uci.edu> * vc-hg.el (log-view-vc-backend): Declare for compiler. - (vc-hg-outgoing-mode, vc-hg-incoming-mode): Set - log-view-vc-backend so that diff can work. + (vc-hg-outgoing-mode, vc-hg-incoming-mode): + Set log-view-vc-backend so that diff can work. * log-view.el (log-view-diff): Use vc-diff-internal instead of vc-version-diff. @@ -74,8 +79,8 @@ (copy-directory): Use it. Remove parameter PRESERVE-UID-GID. * net/tramp.el (tramp-verbose): Fix docstring. - (tramp-methods): Add recursive option to `tramp-copy-args'. Add - `tramp-copy-recursive'. Valid for "rcp", "scp", "scp1", "scp2", + (tramp-methods): Add recursive option to `tramp-copy-args'. + Add `tramp-copy-recursive'. Valid for "rcp", "scp", "scp1", "scp2", "scp1_old", "scp2_old", "rsync", "rsyncc". (tramp-default-method): Check also for `auth-source-user-or-password'. (tramp-file-name-handler-alist, tramp-file-name-for-operation):
--- a/lisp/help-fns.el Mon Oct 05 15:32:08 2009 +0000 +++ b/lisp/help-fns.el Mon Oct 05 19:50:15 2009 +0000 @@ -457,7 +457,9 @@ (terpri))))) ;; Note that list* etc do not get this property until ;; cl-hack-byte-compiler runs, after bytecomp is loaded. - (when (eq (get function 'byte-compile) 'cl-byte-compile-compiler-macro) + (when (and (symbolp function) + (eq (get function 'byte-compile) + 'cl-byte-compile-compiler-macro)) (princ "This function has a compiler macro") (let ((lib (get function 'compiler-macro-file))) (when (stringp lib)