aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2008-12-02 16:32:20 +0000
committerChong Yidong2008-12-02 16:32:20 +0000
commit9636b255906319ca5757e0e709455b863de100b7 (patch)
tree53bb3f1f96e050ad6cec3ebdf63b2adb9a1d8a42 /src
parent92bc26783b8962f9e69ac33b7a5829e115b6eb1f (diff)
downloademacs-9636b255906319ca5757e0e709455b863de100b7.tar.gz
emacs-9636b255906319ca5757e0e709455b863de100b7.zip
(timer_check): Revert last change.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index d81f62c6763..ad6665e6068 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4584,7 +4584,6 @@ timer_check (do_it_now)
4584 { 4584 {
4585 int count = SPECPDL_INDEX (); 4585 int count = SPECPDL_INDEX ();
4586 Lisp_Object old_deactivate_mark = Vdeactivate_mark; 4586 Lisp_Object old_deactivate_mark = Vdeactivate_mark;
4587 struct buffer *b;
4588 4587
4589 /* Mark the timer as triggered to prevent problems if the lisp 4588 /* Mark the timer as triggered to prevent problems if the lisp
4590 code fails to reschedule it right. */ 4589 code fails to reschedule it right. */
@@ -4597,13 +4596,6 @@ timer_check (do_it_now)
4597 timers_run++; 4596 timers_run++;
4598 unbind_to (count, Qnil); 4597 unbind_to (count, Qnil);
4599 4598
4600 /* We must ensure that the current buffer is the same as
4601 the selected window's buffer, because the timers may
4602 have made another buffer current (bug#1458). */
4603 b = XBUFFER (XWINDOW (selected_window)->buffer);
4604 if (b != current_buffer)
4605 set_buffer_internal (b);
4606
4607 /* Since we have handled the event, 4599 /* Since we have handled the event,
4608 we don't need to tell the caller to wake up and do it. */ 4600 we don't need to tell the caller to wake up and do it. */
4609 } 4601 }