X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b0144c1bbe7c2d53b5255f44e176a4e57f6c3a30..6b124390359d516800bc41ba5a9a66b1dd1e5bb9:/lisp/timer.el

diff --git a/lisp/timer.el b/lisp/timer.el
index 68a9e105da..e860f84309 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -183,8 +183,11 @@ fire repeatedly that many seconds apart."
 	nil)
     (error "Invalid or uninitialized timer")))
 
-(defun timer-activate-when-idle (timer)
-  "Arrange to activate TIMER whenever Emacs is next idle."
+(defun timer-activate-when-idle (timer &optional dont-wait)
+  "Arrange to activate TIMER whenever Emacs is next idle.
+If optional argument DONT-WAIT is non-nil, then enable the
+timer to activate immediately, or at the right time, if Emacs
+is already idle."
   (if (and (timerp timer)
 	   (integerp (aref timer 1))
 	   (integerp (aref timer 2))
@@ -206,7 +209,7 @@ fire repeatedly that many seconds apart."
 	(if last
 	    (setcdr last (cons timer timers))
 	  (setq timer-idle-list (cons timer timers)))
-	(aset timer 0 t)
+	(aset timer 0 (not dont-wait))
 	(aset timer 7 t)
 	nil)
     (error "Invalid or uninitialized timer")))
@@ -264,10 +267,6 @@ This function is called, by name, directly by the C code."
 	(progn
 	  ;; Delete from queue.
 	  (cancel-timer timer)
-	  ;; Run handler
-	  (condition-case nil
-	      (apply (aref timer 5) (aref timer 6))
-	    (error nil))
 	  ;; Re-schedule if requested.
 	  (if (aref timer 4)
 	      (if (aref timer 7)
@@ -282,7 +281,13 @@ This function is called, by name, directly by the C code."
 				      (aref timer 4))))
 		      (if (> repeats timer-max-repeats)
 			  (timer-inc-time timer (* (aref timer 4) repeats)))))
-		(timer-activate timer))))
+		(timer-activate timer)))
+	  ;; Run handler.
+	  ;; We do this after rescheduling so that the handler function
+	  ;; can cancel its own timer successfully with cancel-timer.
+	  (condition-case nil
+	      (apply (aref timer 5) (aref timer 6))
+	    (error nil)))
       (error "Bogus timer event"))))
 
 ;; This function is incompatible with the one in levents.el.
@@ -368,9 +373,11 @@ This function is for compatibility; see also `run-with-timer'."
 ;;;###autoload
 (defun run-with-idle-timer (secs repeat function &rest args)
   "Perform an action the next time Emacs is idle for SECS seconds.
-If REPEAT is non-nil, do this each time Emacs is idle for SECS seconds.
-SECS may be an integer or a floating point number.
 The action is to call FUNCTION with arguments ARGS.
+SECS may be an integer or a floating point number.
+
+If REPEAT is non-nil, do the action each time Emacs has been idle for
+exactly SECS seconds (that is, only once for each time Emacs becomes idle).
 
 This function returns a timer object which you can use in `cancel-timer'."
   (interactive