aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-04-25 15:12:49 +0000
committerGerd Moellmann2001-04-25 15:12:49 +0000
commitc88164fe6b832249d756929837acf949de6f8a8c (patch)
treeb6ffd023a101a75beb33abab11473d54ad670ebd /src
parentbfd8410fc2e9901716ce0a772f8a455afe8f8e21 (diff)
downloademacs-c88164fe6b832249d756929837acf949de6f8a8c.tar.gz
emacs-c88164fe6b832249d756929837acf949de6f8a8c.zip
(wait_reading_process_input): Call
record_asynch_buffer_change only if a timer really changed buffers.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/process.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3f399316200..343423bafce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12001-04-25 Gerd Moellmann <gerd@gnu.org> 12001-04-25 Gerd Moellmann <gerd@gnu.org>
2 2
3 * process.c (wait_reading_process_input): Call
4 record_asynch_buffer_change only if a timer really changed
5 buffers.
6
3 * buffer.c (mouse_face_overlay_overlaps): Fix the computation 7 * buffer.c (mouse_face_overlay_overlaps): Fix the computation
4 of the number of overlays to check. 8 of the number of overlays to check.
5 9
diff --git a/src/process.c b/src/process.c
index 15fc26c6634..20edc9d85aa 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2453,12 +2453,14 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2453 do 2453 do
2454 { 2454 {
2455 int old_timers_run = timers_run; 2455 int old_timers_run = timers_run;
2456 struct buffer *old_buffer = current_buffer;
2456 2457
2457 timer_delay = timer_check (1); 2458 timer_delay = timer_check (1);
2458 2459
2459 /* If a timer has run, this might have changed buffers 2460 /* If a timer has run, this might have changed buffers
2460 an alike. Make read_key_sequence aware of that. */ 2461 an alike. Make read_key_sequence aware of that. */
2461 if (timers_run != old_timers_run 2462 if (timers_run != old_timers_run
2463 && old_buffer != current_buffer
2462 && waiting_for_user_input_p == -1) 2464 && waiting_for_user_input_p == -1)
2463 record_asynch_buffer_change (); 2465 record_asynch_buffer_change ();
2464 2466
@@ -2678,6 +2680,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2678 if (XINT (read_kbd) != 0) 2680 if (XINT (read_kbd) != 0)
2679 { 2681 {
2680 int old_timers_run = timers_run; 2682 int old_timers_run = timers_run;
2683 struct buffer *old_buffer = current_buffer;
2681 int leave = 0; 2684 int leave = 0;
2682 2685
2683 if (detect_input_pending_run_timers (do_display)) 2686 if (detect_input_pending_run_timers (do_display))
@@ -2690,7 +2693,8 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
2690 /* If a timer has run, this might have changed buffers 2693 /* If a timer has run, this might have changed buffers
2691 an alike. Make read_key_sequence aware of that. */ 2694 an alike. Make read_key_sequence aware of that. */
2692 if (timers_run != old_timers_run 2695 if (timers_run != old_timers_run
2693 && waiting_for_user_input_p == -1) 2696 && waiting_for_user_input_p == -1
2697 && old_buffer != current_buffer)
2694 record_asynch_buffer_change (); 2698 record_asynch_buffer_change ();
2695 2699
2696 if (leave) 2700 if (leave)