From: yamaoka <yamaoka>
Date: Wed, 16 Oct 2002 12:37:12 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-05-quimby~31
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0aee56b76a1840d647864f9e3bdd232d98c42b29;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dc6e7d..e995b1b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* spam-stat.el: Check for the existence of hash functions instead
+	of the Emacs version to decide whether to load cl.  Suggested by
+	Kai Gro,A_(Bjohann.
+
 2002-10-15  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
 	* gnus-agent.el (gnus-agent-fetch-selected-article): Open history
diff --git a/lisp/spam-stat.el b/lisp/spam-stat.el
index 967c948..0a0fcf9 100644
--- a/lisp/spam-stat.el
+++ b/lisp/spam-stat.el
@@ -180,11 +180,11 @@ This is set by hooking into Gnus.")
 
 ;; Functions missing in Emacs 20
 
-(eval-and-compile
-  (when (and (not (featurep 'xemacs))
-	     (= emacs-major-version 20))
-    ;; gethash, hash-table-count, make-hash-table, mapc
-    (require 'cl)
+(when (memq nil (mapcar 'fboundp
+			'(gethash hash-table-count make-hash-table
+				  mapc puthash)))
+  (require 'cl)
+  (unless (fboundp 'puthash)
     ;; alias puthash is missing from Emacs 20 cl-extra.el
     (defalias 'puthash 'cl-puthash)))