From: yamaoka <yamaoka>
Date: Sun, 5 Jun 2005 10:29:14 +0000 (+0000)
Subject: * poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
X-Git-Tag: apel-10_7~19
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cec45f5f3343f253c55493ac4d700ed3841467f4;p=elisp%2Fapel.git

* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
 From Kinoshita-san.
---

diff --git a/ChangeLog b/ChangeLog
index 449b3f2..662525d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-05  Tatsuya Kinoshita  <tats@vega.ocn.ne.jp>
+
+	* poe-xemacs.el: Load `timer' even if `timer-funcs' exists.
+
 2005-05-10  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* poe.el (split-string): Import from Emacs 22. Add omit-nulls
diff --git a/poe-xemacs.el b/poe-xemacs.el
index 5824235..49ebc74 100644
--- a/poe-xemacs.el
+++ b/poe-xemacs.el
@@ -81,13 +81,14 @@ When called interactively, prompt for the name of the color to use."
 ;;; @ timer
 ;;;
 
+(condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
+    (require 'timer)
+  (error nil))
 (or
- (condition-case nil
-     (require 'timer-funcs)
-   (error nil))
- (condition-case nil
-     (require 'timer)
-   (error nil))
+ (or (featurep 'timer-funcs) (featurep 'timer))
  (progn
    (require 'itimer)
    (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))