summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2008-01-10 04:09:49 +0000
committerGlenn Morris <rgm@gnu.org>2008-01-10 04:09:49 +0000
commit63dbe8da55f83719acaf0dbd74d6273137334c6f (patch)
treefb0accb5ce6c2ae15dc0f949dc2c3469fbf4cfab
parent511e35591a60d2577e5d0ed7199c5bdfb5f9ba83 (diff)
downloademacs-63dbe8da55f83719acaf0dbd74d6273137334c6f.tar.gz
Chong Yidong <cyd at stupidchicken.com>
(wait_reading_process_output): Check for window changes caused by timers.
-rw-r--r--admin/FOR-RELEASE9
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 8ac97232def..4f1d8d3a6c3 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -50,13 +50,6 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html
* BUGS
-** schierlm@gmx.de, 25 Dec: Crash when buffer is edited while save-buffer asks for coding system
-http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-12/msg00134.html
-
-** bojohan+news@dd.chalmers.se, 19 Nov: appointment display during isearch replaces buffer contents with history element.
-http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-01/msg00005.html
-(patch)
-
** eric@openbsd.org, 24 Nov: c-mode syntactic analysis regression in emacs-22.1
http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00589.html
@@ -65,7 +58,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00460.html
reproducible?
** nico@ngolde.de, 7 Jan: some code issues
-some unsafe code in pop.c
+some unsafe code in pop.c, etags.c
http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg00654.html
* DOCUMENTATION
diff --git a/src/ChangeLog b/src/ChangeLog
index 7efd990fc0f..287959462be 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-10 Chong Yidong <cyd@stupidchicken.com>
+
+ * process.c (wait_reading_process_output): Check for window
+ changes caused by timers.
+
2008-01-08 Glenn Morris <rgm@gnu.org>
* emacs.c (main): Set copyright year to 2008.
diff --git a/src/process.c b/src/process.c
index bf974352a29..f7abc7993d3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4697,6 +4697,7 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
{
int old_timers_run = timers_run;
struct buffer *old_buffer = current_buffer;
+ Lisp_Object old_window = selected_window;
int leave = 0;
if (detect_input_pending_run_timers (do_display))
@@ -4710,7 +4711,8 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
an alike. Make read_key_sequence aware of that. */
if (timers_run != old_timers_run
&& waiting_for_user_input_p == -1
- && old_buffer != current_buffer)
+ && (old_buffer != current_buffer
+ || !EQ (old_window, selected_window)))
record_asynch_buffer_change ();
if (leave)