xemacs-beta: lisp/itimer.el comparison

comparison lisp/itimer.el @ 430:a5df635868b2 r21-2-23

Import from CVS: tag r21-2-23

author	cvs
date	Mon, 13 Aug 2007 11:29:08 +0200
parents	3ecd8885ac67
children	8de8e3f6228a

comparison

equal deleted inserted replaced

-:8305706cbb93
+:a5df635868b2
 ;;; 02139, USA.
 ;;;
 ;;; Send bug reports to kyle_jones@wonderworks.com
 (provide 'itimer)
+(require 'lisp-float-type)
 ;; `itimer' feature means Emacs-Lisp programmers get:
 ;;    itimerp
 ;;    itimer-live-p
 ;;    itimer-value
 ;;    list-itimers
 ;;    start-itimer
 ;;
 ;; See the doc strings of these functions for more information.
-(defvar itimer-version "1.07"
+(defvar itimer-version "1.08"
 "Version number of the itimer package.")
 (defvar itimer-list nil
 "List of all active itimers.")
 is not being used to drive the system.")
 (defvar itimer-timer-last-wakeup nil
 "The time the timer driver function last ran.")
-(defvar itimer-short-interval (if (featurep 'lisp-float-type) 1e-3 1)
+(defvar itimer-short-interval 1e-3
 "Interval used for scheduling an event a very short time in the future.
 Used internally to make the scheduler wake up early.
 Unit is seconds.")
 ;; This value is maintained internally; it does not determine
 		    (list 'list ''stringp var)))))
 ;; Functions to access and modify itimer attributes.
 (defun itimerp (obj)
-"Return t if OBJ is an itimer."
+"Return non-nil if OBJ is an itimer."
 (and (consp obj) (eq (length obj) 8)))
 (defun itimer-live-p (obj)
 "Return non-nil if OBJ is an itimer and is active.
 ``Active'' means Emacs will run it when it expires.
 (check-itimer itimer)
 (nth 1 itimer))
 (defun itimer-restart (itimer)
 "Return the value to which ITIMER will be set at restart.
-Return nil if this itimer doesn't restart."
+The value nil is returned if this itimer isn't set to restart."
 (check-itimer itimer)
 (nth 2 itimer))
 (defun itimer-function (itimer)
 "Return the function of ITIMER.
 (nth 3 itimer))
 (defun itimer-is-idle (itimer)
 "Return non-nil if ITIMER is an idle timer.
 Normal timers expire after a set interval.  Idle timers expire
-only after Emacs has been idle for a specific interval.
+only after Emacs has been idle for a specific interval.  ``Idle''
-``Idle'' means no command events occur within the interval."
+means no command events have occurred within the interval."
 (check-itimer itimer)
 (nth 4 itimer))
 (defun itimer-uses-arguments (itimer)
 "Return non-nil if the function of ITIMER will be called with arguments.
 (check-itimer itimer)
 (nth 5 itimer))
 (defun itimer-function-arguments (itimer)
 "Return the function arguments of ITIMER as a list.
-ITIMER's function is called with these argument each time ITIMER expires."
+ITIMER's function is called with these arguments each time ITIMER expires."
 (check-itimer itimer)
 (nth 6 itimer))
 (defun itimer-recorded-run-time (itimer)
 (check-itimer itimer)
 Optional second arg INITIAL-INPUT non-nil is inserted into the
 minibuffer as initial user input."
 (get-itimer (completing-read prompt itimer-list nil 'confirm initial-input)))
 (defun delete-itimer (itimer)
-"Delete ITIMER.  ITIMER may be an itimer or the name of one."
+"Deletes ITIMER.  ITIMER may be an itimer or the name of one."
 (check-itimer-coerce-string itimer)
 (setq itimer-list (delq itimer itimer-list)))
 (defun start-itimer (name function value &optional restart
 		     is-idle with-args &rest function-arguments)
 If your version of Emacs supports floating point numbers then
 VALUE can be a floating point number.  Otherwise it
 must be an integer.
 Optional fourth arg RESTART non-nil means that this itimer should be
 restarted automatically after its function is called.  Normally an itimer
 is deleted at expiration after its function has returned.
-If non-nil, RESTART should be a number indicating the value at which
+If non-nil RESTART should be a number indicating the value at which the
-the itimer should be set at restart time.
+itimer should be set at restart time.
 Optional fifth arg IS-IDLE specifies if this is an idle timer.
 Normal timers expire after a set interval.  Idle timers expire
-only after Emacs has been idle for specific interval.
+only after Emacs has been idle for specific interval.  ``Idle''
-``Idle'' means no command events occur within the interval.
+means no command events have occurred within the interval.
 Returns the newly created itimer."
 (interactive
 (list (completing-read "Start itimer: " itimer-list)
 	 (read (completing-read "Itimer function: " obarray 'fboundp))
 	 (let (value)
 		  (let* ((current-itimer itimer)
 			 (quit-flag nil)
 			 (inhibit-quit nil)
 			 ;; for FSF Emacs timer.el emulation under XEmacs.
 			 ;; eldoc expect this to be done, apparently.
-			 (this-command nil))
+			 (this-command nil)
+			 ;; bind these variables so that the
+			 ;; itimer function can't screw with
+			 ;; them.
+			 last-event-time next-wakeup
+			 itimer itimers time-elapsed)
 		    (if (itimer-uses-arguments current-itimer)
 			(apply (itimer-function current-itimer)
 			       (itimer-function-arguments current-itimer))
 		      (funcall (itimer-function current-itimer)))))
 	      (error (message "itimer \"%s\" signaled: %s" (itimer-name itimer)
 (if (< secs 0)
 	 (setq carry 1
 	       secs (+ secs 65536))
 (setq carry 0))
 (setq 65536-secs (- (nth 0 t1) (nth 0 t2) carry))
-;; loses for interval larger than the maximum signed Lisp integer.
+(+ (* 65536-secs 65536.0)
-;; can't really be helped.
-(+ (* 65536-secs 65536)
 secs
-(/ usecs (if (featurep 'lisp-float-type) 1e6 1000000)))))
+(/ usecs 1000000.0))))
 (defun itimer-timer-driver (&rest ignored)
 ;; inhibit quit because if the user quits at an inopportune
 ;; time, the timer process won't be launched again and the
 ;; system stops working.  itimer-run-expired-timers allows

Mercurial > hg > xemacs-beta

comparison lisp/itimer.el @ 430:a5df635868b2 r21-2-23