# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1228235540 0
# Node ID 173352468c0f770fcbe4958777e6efaa69004f28
# Parent  821fb85ac9b10b8b4f02cbd58cadee3ec882e50c
(timer_check): Revert last change.

diff -r 821fb85ac9b1 -r 173352468c0f src/keyboard.c
--- a/src/keyboard.c	Tue Dec 02 16:32:11 2008 +0000
+++ b/src/keyboard.c	Tue Dec 02 16:32:20 2008 +0000
@@ -4584,7 +4584,6 @@
 	    {
 	      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.  */
@@ -4597,13 +4596,6 @@
 	      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.  */
 	    }