+
+ * spam.el (gnus-summary-mode-map): make spam-generic-score the
+ default scoring function
+ (spam-generic-score): calls spam-spamassassin-score if
+ spam-use-spamassassin or spam-use-spamassassin-headers is on;
+ spam-bogofilter-score otherwise.
+
+ From Hubert Chan <hubert@uhoreg.ca>: