timer vs. itimer

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5b0d63..0dd0f10 100644 (file)
--- 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 3a4d4bb..3d69b5b 100644 (file)
--- 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 78d7286..40d6d06 100644 (file)
--- 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 33a91c9..7bf3047 100644 (file)
--- 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