* poe-xemacs.el (run-at-time): Attempt to load `timer-funcs' before `timer'.

diff --git a/ChangeLog b/ChangeLog
index d3b6d3e..a2ba643 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * poe-xemacs.el (run-at-time): Attempt to load `timer-funcs'
+       before `timer'.
+
 2004-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * README.en, README.ja (CVS): Remove the description about

diff --git a/poe-xemacs.el b/poe-xemacs.el
index 8915103..5824235 100644 (file)
--- a/poe-xemacs.el
+++ b/poe-xemacs.el
@@ -81,9 +81,14 @@ When called interactively, prompt for the name of the color to use."
 ;;; @ timer
 ;;;
 
-(condition-case nil
-    (require 'timer)
-  (error
+(or
+ (condition-case nil
+     (require 'timer-funcs)
+   (error nil))
+ (condition-case nil
+     (require 'timer)
+   (error nil))
+ (progn
    (require 'itimer)
    (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
        (defun-maybe run-at-time (time repeat function &rest args)