[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110802: * process.c (wait_reading_pr
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110802: * process.c (wait_reading_process_output): Revert previous change. |
Date: |
Mon, 05 Nov 2012 12:00:58 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110802
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-11-05 12:00:58 +0800
message:
* process.c (wait_reading_process_output): Revert previous change.
modified:
src/ChangeLog
src/process.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-05 03:18:32 +0000
+++ b/src/ChangeLog 2012-11-05 04:00:58 +0000
@@ -1,3 +1,7 @@
+2012-11-05 Chong Yidong <address@hidden>
+
+ * process.c (wait_reading_process_output): Revert previous change.
+
2012-11-05 Paul Eggert <address@hidden>
Assume at least POSIX.1-1988 for getpgrp, setpgid, setsid (Bug#12800).
=== modified file 'src/process.c'
--- a/src/process.c 2012-11-05 03:18:32 +0000
+++ b/src/process.c 2012-11-05 04:00:58 +0000
@@ -4336,6 +4336,8 @@
while (1)
{
+ int timeout_reduced_for_timers = 0;
+
/* If calling from keyboard input, do not quit
since we want to return C-g as an input character.
Otherwise, do pending quit if requested. */
@@ -4415,7 +4417,10 @@
if (EMACS_TIME_VALID_P (timer_delay))
{
if (EMACS_TIME_LT (timer_delay, timeout))
- timeout = timer_delay;
+ {
+ timeout = timer_delay;
+ timeout_reduced_for_timers = 1;
+ }
}
else
{
@@ -4674,12 +4679,9 @@
/* If we woke up due to SIGWINCH, actually change size now. */
do_pending_window_change (0);
- /* We used to break here if nfds == 0, i.e. we seemed to have
- waited the full period. But apparently if Emacs receives
- SIGIO between set_waiting_for_input and select, select can
- return with nfds == 0 due to the timeout being zeroed out by
- the signal handler (Bug#11536). */
-
+ if ((time_limit || nsecs) && nfds == 0 && ! timeout_reduced_for_timers)
+ /* We waited the full specified time, so return now. */
+ break;
if (nfds < 0)
{
if (xerrno == EINTR)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110802: * process.c (wait_reading_process_output): Revert previous change.,
Chong Yidong <=