From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sun, 26 Sep 2010 14:01:49 +0000 (+0200)
Subject: Revert previous patch, since it made Gnus backtrace.
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=6d87742a379fa72cbed81cb1a6c9e41161f00734;p=gnus

Revert previous patch, since it made Gnus backtrace.
---

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index 7f1079dba..4956be9fd 100644
--- 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 ((functionp obj)
-	 (funcall obj))
-	((not (symbolp obj))
+  (cond ((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))
-		(functionp (car split)))
+		(symbolp (car split)) (fboundp (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))
-			(functionp (car sub)))
+			(symbolp (car sub)) (fboundp (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))
-		  (functionp (car split)))
+		  (symbolp (car split)) (fboundp (car split)))
 	(setq split (eval split)))
 
       (setq type (elt split 0))