auto upstream

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a25836da996..2fd19c4a467 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-21  Michael Albinus  <michael.albinus@gmx.de>
+
+        * simple.el (process-file): Overwrite stderr file, if exists.
+
 2012-12-21  Daiki Ueno  <ueno@gnu.org>
 
         * epg.el (epg--start): Print GPG_AGENT_INFO in the debug buffer.
diff --git a/lisp/simple.el b/lisp/simple.el
index c0ba5477b56..635d1b0cda3 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2804,7 +2804,7 @@ value passed."
                      (or lc infile)
                      (if stderr-file (list (car buffer) stderr-file) buffer)
                      display args)
-            (when stderr-file (copy-file stderr-file (cadr buffer)))))
+            (when stderr-file (copy-file stderr-file (cadr buffer) t))))
       (when stderr-file (delete-file stderr-file))
       (when lc (delete-file lc)))))