aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2008-01-10 04:08:55 +0000
committerGlenn Morris2008-01-10 04:08:55 +0000
commitc0323133334f70c2e25f4ace22084e3696bf2a5a (patch)
treec517b294f36f84c0918d6a31d62f71bc39165bc3 /src
parent86a6434d770818b9f29e9c42629d3257f5062a15 (diff)
downloademacs-c0323133334f70c2e25f4ace22084e3696bf2a5a.tar.gz
emacs-c0323133334f70c2e25f4ace22084e3696bf2a5a.zip
Chong Yidong <cyd at stupidchicken.com>
(wait_reading_process_output): Check for window changes caused by timers.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6433adaee13..18b1e04a1d7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-01-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * process.c (wait_reading_process_output): Check for window
4 changes caused by timers.
5
12008-01-09 Kenichi Handa <handa@ni.aist.go.jp> 62008-01-09 Kenichi Handa <handa@ni.aist.go.jp>
2 7
3 * coding.c (detect_coding_iso2022): New arg 8 * coding.c (detect_coding_iso2022): New arg
diff --git a/src/process.c b/src/process.c
index 5812660e85a..a48e5435837 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4718,6 +4718,7 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
4718 { 4718 {
4719 int old_timers_run = timers_run; 4719 int old_timers_run = timers_run;
4720 struct buffer *old_buffer = current_buffer; 4720 struct buffer *old_buffer = current_buffer;
4721 Lisp_Object old_window = selected_window;
4721 int leave = 0; 4722 int leave = 0;
4722 4723
4723 if (detect_input_pending_run_timers (do_display)) 4724 if (detect_input_pending_run_timers (do_display))
@@ -4731,7 +4732,8 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
4731 an alike. Make read_key_sequence aware of that. */ 4732 an alike. Make read_key_sequence aware of that. */
4732 if (timers_run != old_timers_run 4733 if (timers_run != old_timers_run
4733 && waiting_for_user_input_p == -1 4734 && waiting_for_user_input_p == -1
4734 && old_buffer != current_buffer) 4735 && (old_buffer != current_buffer
4736 || !EQ (old_window, selected_window)))
4735 record_asynch_buffer_change (); 4737 record_asynch_buffer_change ();
4736 4738
4737 if (leave) 4739 if (leave)