From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Wed, 20 Sep 2000 15:06:07 +0000 (+0000)
Subject: timer vs. itimer
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=e38788559229907c6475a2b15182baea4a6c13de

timer vs. itimer
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5b0d63c0..0dd0f10ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-20 12:02:24  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-demon.el: Use (featurep 'xemacs).
+	* gnus-agent.el: timer vs. itimer.
+	* mail-source.el: Ditto.
+
 2000-09-19 10:24:57  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-group.el (gnus-group-make-kiboze-group): Makedir.
diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 3a4d4bb81..3d69b5b6a 100644
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -28,7 +28,9 @@
 (require 'nnvirtual)
 (require 'gnus-sum)
 (eval-when-compile
-  (require 'timer)
+  (if (featurep 'xemacs)
+      (require 'itimer)
+    (require 'timer))
   (require 'cl)
   (require 'gnus-score))
 
diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 78d7286d3..40d6d0670 100644
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -34,7 +34,7 @@
 (require 'nnmail)
 (require 'gnus-util)
 (eval-and-compile
-  (if (string-match "XEmacs" (emacs-version))
+  (if (featurep 'xemacs)
       (require 'itimer)
     (require 'timer)))
 
diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 33a91c9bb..7bf304778 100644
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -687,7 +687,10 @@ If ARGS, PROMPT is used as an argument to `format'."
 (defvar mail-source-report-new-mail-timer nil)
 (defvar mail-source-report-new-mail-idle-timer nil)
 
-(eval-when-compile (require 'timer))
+(eval-when-compile 
+  (if (featurep 'xemacs)
+      (require 'itimer)
+    (require 'timer)))
 
 (defun mail-source-start-idle-timer ()
   ;; Start our idle timer if necessary, so we delay the check until the