From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 4 Nov 2010 19:56:50 +0000 (-0400)
Subject: Backport fix for Bug#5723 from trunk.
X-Git-Tag: emacs-pretest-23.2.90~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=055c91d4329071935d2f521e54b5fa0c998a84d3;p=emacs.git

Backport fix for Bug#5723 from trunk.
---

055c91d4329071935d2f521e54b5fa0c998a84d3
diff --cc src/ChangeLog
index 077385d6f6c,16703ef5201..b803582e5f6
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,3 -1,18 +1,18 @@@
 -2010-03-27  Chong Yidong  <cyd@stupidchicken.com>
++2010-11-04  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* process.c (Fmake_network_process): Don't apply Bug#5173 fix for
+ 	Windows.
+ 
 -2010-03-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
++2010-11-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+ 	* process.c (Fmake_network_process): Don't call turn_on_atimers around
+ 	`connect' (Bug#5723).
+ 
 -2010-03-25  Helmut Eller  <eller.helmut@gmail.com>
++2010-11-04  Helmut Eller  <eller.helmut@gmail.com>
+ 
+ 	* process.c (Fmake_network_process): Call `select' for interrupted
+ 	`connect' rather than creating new socket (Bug#5173).
+ 
  2010-11-04  Kenichi Handa  <handa@m17n.org>
  
  	* font.c (font_delete_unmatched): Check Vface_ignored_fonts.