* nnheaderxm.el (nnheader-xmas-run-at-time): Use a simple function

 definition if there is not a bug in start-itimer.

* pgg.el (pgg-run-at-time): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca40c74..466914d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnheaderxm.el (nnheader-xmas-run-at-time): Use a simple function
+       definition if there is not a bug in start-itimer.
+
+       * pgg.el (pgg-run-at-time): Ditto.
+
 2003-12-11  Kevin Greiner <kgreiner@xpediantsolutions.com>
 
        * gnus-agent.el (gnus-agent-possibly-alter-active): New Function.

diff --git a/lisp/nnheaderxm.el b/lisp/nnheaderxm.el
index eb6304a..5b6805a 100644 (file)
--- a/lisp/nnheaderxm.el
+++ b/lisp/nnheaderxm.el
@@ -27,39 +27,67 @@
 
 ;;; Code:
 
-(defun nnheader-xmas-run-at-time (time repeat function &rest args)
-  "Emulating function run as `run-at-time' in the right way.
-TIME should be nil meaning now or a number of seconds from now.
+(if (condition-case nil
+       (progn
+         (unless (or itimer-process itimer-timer)
+           (itimer-driver-start))
+         ;; Check whether there is a bug to which the difference of
+         ;; the present time and the time when the itimer driver was
+         ;; woken up is subtracted from the initial itimer value.
+         (let* ((inhibit-quit t)
+                (ctime (current-time))
+                (itimer-timer-last-wakeup
+                 (prog1
+                     ctime
+                   (setcar ctime (1- (car ctime)))))
+                (itimer-list nil)
+                (itimer (start-itimer "nnheader-run-at-time" 'ignore 5)))
+           (sleep-for 0.1) ;; Accept the timeout interrupt.
+           (prog1
+               (> (itimer-value itimer) 0)
+             (delete-itimer itimer))))
+      (error nil))
+    (defun nnheader-xmas-run-at-time (time repeat function &rest args)
+      "Emulating function run as `run-at-time'.
+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 "nnheader-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))))
+      (apply #'start-itimer "nnheader-run-at-time"
+            function (if time (max time 1e-9) 1e-9)
+            repeat nil t args))
+  (defun nnheader-xmas-run-at-time (time repeat function &rest args)
+    "Emulating function run as `run-at-time' in the right way.
+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 "nnheader-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)))))
 
 (defalias 'nnheader-run-at-time 'nnheader-xmas-run-at-time)
 (defalias 'nnheader-cancel-timer 'delete-itimer)

diff --git a/lisp/pgg.el b/lisp/pgg.el
index 047a4cf..673e24a 100644 (file)
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -97,48 +97,81 @@
       (read-passwd prompt)))
 
 (eval-when-compile
+  (defvar itimer-process)
+  (defvar itimer-timer)
   (autoload 'delete-itimer "itimer")
+  (autoload 'itimer-driver-start "itimer")
+  (autoload 'itimer-value "itimer")
   (autoload 'set-itimer-function "itimer")
   (autoload 'set-itimer-function-arguments "itimer")
-  (autoload 'set-itimer-restart "itimer"))
+  (autoload 'set-itimer-restart "itimer")
+  (autoload 'start-itimer "itimer"))
 
 (eval-and-compile
   (defalias
     'pgg-run-at-time
     (if (featurep 'xemacs)
-       (lambda (time repeat function &rest args)
-         "Emulating function run as `run-at-time' in the right way.
-TIME should be nil meaning now or a number of seconds from now.
+       (if (condition-case nil
+               (progn
+                 (unless (or itimer-process itimer-timer)
+                   (itimer-driver-start))
+                 ;; Check whether there is a bug to which the difference of
+                 ;; the present time and the time when the itimer driver was
+                 ;; woken up is subtracted from the initial itimer value.
+                 (let* ((inhibit-quit t)
+                        (ctime (current-time))
+                        (itimer-timer-last-wakeup
+                         (prog1
+                             ctime
+                           (setcar ctime (1- (car ctime)))))
+                        (itimer-list nil)
+                        (itimer (start-itimer "pgg-run-at-time" 'ignore 5)))
+                   (sleep-for 0.1) ;; Accept the timeout interrupt.
+                   (prog1
+                       (> (itimer-value itimer) 0)
+                     (delete-itimer itimer))))
+             (error nil))
+           (lambda (time repeat function &rest args)
+             "Emulating function run as `run-at-time'.
+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 "pgg-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))))
+             (apply #'start-itimer "pgg-run-at-time"
+                    function (if time (max time 1e-9) 1e-9)
+                    repeat nil t args))
+         (lambda (time repeat function &rest args)
+           "Emulating function run as `run-at-time' in the right way.
+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 "pgg-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)))))
       'run-at-time)))
 
 (defun pgg-add-passphrase-cache (key passphrase)