Function needn't be a symbol.

From Dave Love  <fx@gnu.org>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4666f1d..111f675 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-08  Dave Love  <fx@gnu.org>
+
+       * gnus-win.el (gnus-window-to-buffer-helper,
+       gnus-all-windows-visible-p): Function needn't be a symbol.
+
+       * mail-source.el (mail-source-value): Function needn't be a symbol.
+
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-cite-prefix-regexp): Remove } from the cite

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 4956be9..7f1079d 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -289,12 +289,12 @@ See the Gnus manual for an explanation of the syntax used.")
 (defvar gnus-frame-list nil)
 
 (defun gnus-window-to-buffer-helper (obj)
-  (cond ((not (symbolp obj))
+  (cond ((functionp obj)
+        (funcall obj))
+       ((not (symbolp obj))
         obj)
        ((boundp obj)
         (symbol-value obj))
-       ((fboundp obj)
-        (funcall obj))
        (t
         nil)))
 
@@ -315,7 +315,7 @@ See the Gnus manual for an explanation of the syntax used.")
     ;; The SPLIT might be something that is to be evaled to
     ;; return a new SPLIT.
     (while (and (not (assq (car split) gnus-window-to-buffer))
-               (symbolp (car split)) (fboundp (car split)))
+               (functionp (car split)))
       (setq split (eval split)))
     (let* ((type (car split))
           (subs (cddr split))
@@ -378,7 +378,7 @@ See the Gnus manual for an explanation of the syntax used.")
          (while subs
            (setq sub (append (pop subs) nil))
            (while (and (not (assq (car sub) gnus-window-to-buffer))
-                       (symbolp (car sub)) (fboundp (car sub)))
+                       (functionp (car sub)))
              (setq sub (eval sub)))
            (when sub
              (push sub comp-subs)
@@ -518,7 +518,7 @@ should have point."
       ;; The SPLIT might be something that is to be evaled to
       ;; return a new SPLIT.
       (while (and (not (assq (car split) gnus-window-to-buffer))
-                 (symbolp (car split)) (fboundp (car split)))
+                 (functionp (car split)))
        (setq split (eval split)))
 
       (setq type (elt split 0))

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 662b999..59f263f 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -530,7 +530,7 @@ See `mail-source-bind'."
    ((stringp value)
     value)
    ;; Function
-   ((and (listp value) (symbolp (car value)) (fboundp (car value)))
+   ((and (listp value) (functionp (car value)))
     (eval value))
    ;; Just return the value.
    (t