aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog1
-rw-r--r--src/process.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 45e8eb1025d..a0f83560603 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * process.c (wait_reading_process_output): Fix asynchrounous 3 * process.c (wait_reading_process_output): Fix asynchrounous
4 GnuTLS socket handling on some versions of the GnuTLS library. 4 GnuTLS socket handling on some versions of the GnuTLS library.
5 (wait_reading_process_output): Add comment and URL.
5 6
62011-11-21 Jan Djärv <jan.h.d@swipnet.se> 72011-11-21 Jan Djärv <jan.h.d@swipnet.se>
7 8
diff --git a/src/process.c b/src/process.c
index 02eb1122a07..a02ba44ae71 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4625,7 +4625,11 @@ wait_reading_process_output (int time_limit, int microsecs, int read_kbd,
4625 if (! wait_proc) 4625 if (! wait_proc)
4626 { 4626 {
4627 /* We're not waiting on a specific process, so loop 4627 /* We're not waiting on a specific process, so loop
4628 through all the channels and check for data. */ 4628 through all the channels and check for data.
4629 This is a workaround needed for some versions of
4630 the gnutls library -- 2.12.14 has been confirmed
4631 to need it. See
4632 http://comments.gmane.org/gmane.emacs.devel/145074 */
4629 struct Lisp_Process *proc; 4633 struct Lisp_Process *proc;
4630 for (channel = 0; channel < MAXDESC; ++channel) 4634 for (channel = 0; channel < MAXDESC; ++channel)
4631 { 4635 {