2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 96cc3112700..4047037cb72 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mail-source.el (mail-source-value):
+        Prefer fboundp to functionp so it works with macros as well.
+
 2008-04-05  Glenn Morris  <rgm@gnu.org>
 
         * gnus-ems.el (mm-disable-multibyte): Autoload it.
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 088b91d8d58..583b19049c4 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -500,8 +500,7 @@ See `mail-source-bind'."
    ((stringp value)
     value)
    ;; Function
-   ((and (listp value)
-         (functionp (car value)))
+   ((and (listp value) (symbolp (car value)) (fboundp (car value)))
     (eval value))
    ;; Just return the value.
    (t