* mail-source.el: Don't require timer/timer-funcs.

* gnus-async.el: Ditto.

* password.el: Ditto.

* nnheaderxm.el (nnheader-cancel-timer): Ditto.

* mm-url.el: Ditto.

* gnus-xmas.el: Don't require timer-funcs.

* mm-util.el: Require timer/timer-funcs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 952dc57..d6dda57 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2006-04-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail-source.el: Don't require timer/timer-funcs.
+
+       * gnus-async.el: Ditto.
+
+       * password.el: Ditto.
+
+       * nnheaderxm.el (nnheader-cancel-timer): Ditto.
+
+       * mm-url.el: Ditto.
+
+       * gnus-xmas.el: Don't require timer-funcs.
+
+       * mm-util.el: Require timer/timer-funcs.
+
 2006-04-23  Andreas Seltenreich  <andreas+ding@gate450.dyndns.org>  (tiny change)
 
        * mm-url.el (mm-url-insert-file-contents): Don't set Connection:

diff --git a/lisp/gnus-async.el b/lisp/gnus-async.el
index 35af6bc..3e8e316 100644 (file)
--- a/lisp/gnus-async.el
+++ b/lisp/gnus-async.el
@@ -33,10 +33,6 @@
 (require 'gnus-sum)
 (require 'nntp)
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'timer-funcs)))
-
 (defgroup gnus-asynchronous nil
   "Support for asynchronous operations."
   :group 'gnus)

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index 01457de..5720b64 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -35,10 +35,6 @@
 (require 'nntp)
 (require 'nnmail)
 (require 'gnus-util)
-(eval-and-compile
-  (if (featurep 'xemacs)
-      (require 'timer-funcs)
-    (require 'timer)))
 
 (autoload 'parse-time-string "parse-time" nil nil)
 

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 233912e..191eb75 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -39,7 +39,6 @@
 (defvar menu-bar-mode (featurep 'menubar))
 (require 'messagexmas)
 (require 'wid-edit)
-(require 'timer-funcs)
 
 (defgroup gnus-xmas nil
   "XEmacsoid support for Gnus"

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 911caef..4f52102 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -886,11 +886,6 @@ See the Gnus manual for details."
 (defvar mail-source-report-new-mail-timer nil)
 (defvar mail-source-report-new-mail-idle-timer nil)
 
-(eval-when-compile
-  (if (featurep 'xemacs)
-      (require 'timer-funcs)
-    (require 'timer)))
-
 (defun mail-source-start-idle-timer ()
   ;; Start our idle timer if necessary, so we delay the check until the
   ;; user isn't typing.

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 9a395a8..23909d3 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -36,11 +36,6 @@
 (require 'mm-util)
 (require 'gnus)
 
-(eval-when-compile
-  (if (featurep 'xemacs)
-      (require 'timer-funcs)
-    (require 'timer)))
-
 (defvar url-current-object)
 (defvar url-package-name)
 (defvar url-package-version)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 75199c5..83a7bfb 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -29,6 +29,13 @@
 (eval-when-compile (require 'cl))
 (require 'mail-prsvr)
 
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (unless (ignore-errors
+               (require 'timer-funcs))
+       (require 'timer))
+    (require 'timer)))
+
 (eval-and-compile
   (mapcar
    (lambda (elem)

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index 2cd0916..0d43cd2 100644 (file)
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -27,8 +27,6 @@
 
 ;;; Code:
 
-(require 'timer-funcs)
-
 (defalias 'nnheader-cancel-timer 'delete-itimer)
 (defalias 'nnheader-string-as-multibyte 'identity)
 

diff --git a/lisp/password.el b/lisp/password.el
index 9444262..828cae9 100644 (file)
--- a/lisp/password.el
+++ b/lisp/password.el
@@ -59,9 +59,6 @@
 
 ;;; Code:
 
-(when (featurep 'xemacs)
-  (require 'timer-funcs))
-
 (eval-when-compile
   (require 'cl))