From: Kenichi Handa <handa@gnu.org>
Date: Sat, 13 Oct 2012 13:11:40 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~235^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e58893d168a90c475d4b5ba738b19113f6494ea;p=emacs.git

merge trunk
---

2e58893d168a90c475d4b5ba738b19113f6494ea
diff --cc src/ChangeLog
index 3787e006c4f,f5b5bbdc7b1..56131aca4b2
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,20 +1,25 @@@
 +2012-10-13  HANATAKA, Shinya  <bogytech@gmail.com>  (tiny change)
 +
 +	* coding.c (detect_coding): Set coding->id before calling
 +	this->detector.
 +
+ 2012-10-13  Andreas Schwab  <schwab@linux-m68k.org>
+ 
+ 	* fileio.c: Formatting fixes.
+ 
+ 2012-10-13  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	Fix some stat-related races.
+ 	* fileio.c (Fwrite_region): Avoid race condition if a file is
+ 	removed or renamed by some other process immediately after Emacs
+ 	writes it but before Emacs stats it.  Do not assume that stat (or
+ 	fstat) succeeds.
+ 	* image.c (slurp_file): Resolve the file name with fopen + fstat
+ 	rather than stat + fopen.
+ 	(pbm_read_file) [0]: Remove unused code with stat race.
+ 	* process.c (allocate_pty) [HAVE_PTYS && !PTY_ITERATION && !PTY_OPEN]:
+ 	Remove ineffective code with stat race.
+ 
  2012-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
  
  	* doc.c (get_doc_string): Don't signal an error if the file is missing.