comparison src/keyboard.c @ 100075:9b936c1c7102

(timer_check): After a timer runs, ensure that the selected window's buffer is current.

100074:621a2ff9faff

	{
	  if (NILP (vector[0]))
	    {
	      int count = SPECPDL_INDEX ();
	      Lisp_Object old_deactivate_mark = Vdeactivate_mark;

#if 0 /* This shouldn't be necessary anymore.  --lorentey  */
	      /* On unbind_to, resume allowing input from any kboard, if that
                 was true before.  */
              record_single_kboard_state ();
#endif
	      /* Mark the timer as triggered to prevent problems if the lisp
		 code fails to reschedule it right.  */
	      vector[0] = Qt;

	      specbind (Qinhibit_quit, Qt);

	      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.  */
	    }
	}
      else

100075:9b936c1c7102

	{
	  if (NILP (vector[0]))
	    {
	      int count = SPECPDL_INDEX ();
	      Lisp_Object old_deactivate_mark = Vdeactivate_mark;
	      struct buffer *b;

	      /* Mark the timer as triggered to prevent problems if the lisp
		 code fails to reschedule it right.  */
	      vector[0] = Qt;

	      specbind (Qinhibit_quit, Qt);

	      call1 (Qtimer_event_handler, chosen_timer);
	      Vdeactivate_mark = old_deactivate_mark;
	      timers_run++;
	      unbind_to (count, Qnil);

	      /* We must ensure that the current buffer is the same as
		 the selected window's buffer, because the timers may
		 have made another buffer current (bug#1458).  */
	      b = XBUFFER (XWINDOW (selected_window)->buffer);
	      if (b != current_buffer)
		set_buffer_internal (b);
	      
	      /* Since we have handled the event,
		 we don't need to tell the caller to wake up and do it.  */
	    }
	}
      else