update.

[elisp/apel.git] / poe-xemacs.el

diff --git a/poe-xemacs.el b/poe-xemacs.el
index 9b843af..5ebf94f 100644 (file)
--- a/poe-xemacs.el
+++ b/poe-xemacs.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -82,8 +82,14 @@ When called interactively, prompt for the name of the color to use."
 ;;;
 
 (condition-case nil
+    (require 'timer-funcs)
+  (error nil))
+(condition-case nil
     (require 'timer)
-  (error
+  (error nil))
+(or
+ (or (featurep 'timer-funcs) (featurep 'timer))
+ (progn
    (require 'itimer)
    (if (and (= emacs-major-version 19) (<= emacs-minor-version 14))
        (defun-maybe run-at-time (time repeat function &rest args)
@@ -92,7 +98,7 @@ When called interactively, prompt for the name of the color to use."
                          (,function ,@args))
                       time repeat))
      (defun-maybe run-at-time (time repeat function &rest args)
-       "Emulating function run as `run-at-time'.
+       "Function emulating the function of the same name of Emacs.
 TIME should be nil meaning now, or a number of seconds from now.
 Return an itimer object which can be used in either `delete-itimer'
 or `cancel-timer'."
@@ -123,7 +129,7 @@ or `cancel-timer'."
 
 (broken-facility run-at-time-tick-tock
   "`run-at-time' is not punctual."
-  ;; Note that it doesn't support XEmacsen of versions prior to 19.15
+  ;; Note that it doesn't support XEmacsen prior to the version 19.15
   ;; since `start-itimer' doesn't pass arguments to a timer function.
   (or (and (= emacs-major-version 19) (<= emacs-minor-version 14))
       (condition-case nil
@@ -148,41 +154,41 @@ or `cancel-timer'."
        (error nil))))
 
 (when-broken run-at-time-tick-tock
-  (defadvice run-at-time (around make-it-punctual
-                                (time repeat function &rest args)
-                                activate)
-    "This function was redefined to be made punctual by APEL.
-Note that it allows neither a string nor a time in the Emacs style
-\(a list of integers) as the first argument TIME."
-    (let ((itimers (list nil)))
-      (setcar
-       itimers
-       (apply #'start-itimer "run-at-time"
-             (lambda (itimers repeat function &rest args)
-               (let ((itimer (car itimers)))
-                 (if repeat
-                     (progn
-                       (set-itimer-function
-                        itimer
-                        (lambda (itimer repeat function &rest args)
-                          (set-itimer-restart itimer repeat)
-                          (set-itimer-function itimer function)
-                          (set-itimer-function-arguments itimer args)
-                          (apply function args)))
-                       (set-itimer-function-arguments
-                        itimer
-                        (append (list itimer repeat function) args)))
-                   (set-itimer-function
-                    itimer
-                    (lambda (itimer function &rest args)
-                      (delete-itimer itimer)
-                      (apply function args)))
-                   (set-itimer-function-arguments
-                    itimer
-                    (append (list itimer function) args)))))
-             1e-9 (if time (max time 1e-9) 1e-9)
-             nil t itimers repeat function args))
-      (setq ad-return-value (car itimers)))))
+  (defalias 'run-at-time
+    (lambda (time repeat function &rest args)
+      "Function emulating the function of the same name of Emacs.
+It works correctly for TIME even if there is a bug in the XEmacs core.
+TIME should be nil meaning now, or a number of seconds from now.
+Return an itimer object which can be used in either `delete-itimer'
+or `cancel-timer'."
+      (let ((itimers (list nil)))
+       (setcar
+        itimers
+        (apply #'start-itimer "fixed-run-at-time"
+               (lambda (itimers repeat function &rest args)
+                 (let ((itimer (car itimers)))
+                   (if repeat
+                       (progn
+                         (set-itimer-function
+                          itimer
+                          (lambda (itimer repeat function &rest args)
+                            (set-itimer-restart itimer repeat)
+                            (set-itimer-function itimer function)
+                            (set-itimer-function-arguments itimer args)
+                            (apply function args)))
+                         (set-itimer-function-arguments
+                          itimer
+                          (append (list itimer repeat function) args)))
+                     (set-itimer-function
+                      itimer
+                      (lambda (itimer function &rest args)
+                        (delete-itimer itimer)
+                        (apply function args)))
+                     (set-itimer-function-arguments
+                      itimer
+                      (append (list itimer function) args)))))
+               1e-9 (if time (max time 1e-9) 1e-9)
+               nil t itimers repeat function args))))))
 
 
 ;;; @ to avoid bug of XEmacs 19.14