From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 5 Aug 2022 16:34:47 +0000 (-0400)
Subject: * src/keyboard.c (timer_check_2): Replace redundant test with assertion
X-Git-Tag: emacs-29.0.90~1447^2~406
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0da97d66852a0ab3abd3b4116825338636ac9367;p=emacs.git

* src/keyboard.c (timer_check_2): Replace redundant test with assertion
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 02e02448ff8..81e73a28333 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4642,27 +4642,27 @@ timer_check_2 (Lisp_Object timers, Lisp_Object idle_timers)
       /* If timer is ripe, run it if it hasn't been run.  */
       if (ripe)
 	{
-	  if (NILP (AREF (chosen_timer, 0)))
-	    {
-	      specpdl_ref count = SPECPDL_INDEX ();
-	      Lisp_Object old_deactivate_mark = Vdeactivate_mark;
+	  /* If we got here, presumably `decode_timer` has checked
+             that this timer has not yet been triggered.  */
+	  eassert (NILP (AREF (chosen_timer, 0)));
+	  specpdl_ref count = SPECPDL_INDEX ();
+	  Lisp_Object old_deactivate_mark = Vdeactivate_mark;
 
-	      /* Mark the timer as triggered to prevent problems if the lisp
-		 code fails to reschedule it right.  */
-	      ASET (chosen_timer, 0, Qt);
+	  /* Mark the timer as triggered to prevent problems if the lisp
+	     code fails to reschedule it right.  */
+	  ASET (chosen_timer, 0, Qt);
 
-	      specbind (Qinhibit_quit, Qt);
+	  specbind (Qinhibit_quit, Qt);
 
-	      call1 (Qtimer_event_handler, chosen_timer);
-	      Vdeactivate_mark = old_deactivate_mark;
-	      timers_run++;
-	      unbind_to (count, Qnil);
+	  call1 (Qtimer_event_handler, chosen_timer);
+	  Vdeactivate_mark = old_deactivate_mark;
+	  timers_run++;
+	  unbind_to (count, Qnil);
 
-	      /* Since we have handled the event,
-		 we don't need to tell the caller to wake up and do it.  */
-              /* But the caller must still wait for the next timer, so
-                 return 0 to indicate that.  */
-	    }
+	  /* Since we have handled the event,
+	     we don't need to tell the caller to wake up and do it.  */
+          /* But the caller must still wait for the next timer, so
+             return 0 to indicate that.  */
 
 	  nexttime = make_timespec (0, 0);
           break;