(describe-function-1): Don't burp is the function is not a symbol.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f85dba1bffc62f235c5c8f2b0111d3f83693c58..5523ec162d6cbaf797a05610590ba28c4648eb60 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index e30fe28682c0c03a14d5c09238b1cb0ed700bf7c..eed605e3e93cb57de4332cc09c2a55b85521988b 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -457,7 +457,9 @@ suitable file is found, return nil."
              (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)