master f6743099cc9: Back out part of commit db5e84af202

[Eric Abrahamsen]

branch: master
commit f6743099cc907f1f2847f028ff8f3712288c559f
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Back out part of commit db5e84af202
    
    * lisp/gnus/gnus-agent.el (gnus-category-make-function-1): This code is
    untested and was not meant to be part of the earlier commit.
---
 lisp/gnus/gnus-agent.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 0928b179787..1726b806913 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -2920,9 +2920,8 @@ The following commands are available:
    ;; Functions are just returned as is.
    ((or (symbolp predicate)
        (functionp predicate))
-    (let ((fun (or (cdr (assq predicate gnus-category-predicate-alist))
-                  predicate)))
-      (if (symbolp fun) `(,fun) `(funcall ',fun))))
+    `(,(or (cdr (assq predicate gnus-category-predicate-alist))
+          predicate)))
    ;; More complex predicate.
    ((consp predicate)
     `(,(cond