2 files changed, 11 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eed82fc865b..bef6c1593a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * callproc.c (Fcall_process) [MSDOS]: Fix arguments to
+        report_file_error introduced by the change from 2011-05-07.
+
 2011-05-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         * systime.h (Time): Define only if emacs is defined.
@@ -176,11 +181,11 @@
         (Fget_screen_color): New function.
         (syms_of_ntterm): Defsubr it.
 
-        * callproc.c (call_process_cleanup): Don't close and unlink the
-        temporary file if Fcall_process didn't create it in the first
-        place.
-        (Fcall_process): Don't create tempfile if stdout of the child
-        process will be redirected to a file specified with `:file'.
+        * callproc.c (call_process_cleanup) [MSDOS]: Don't close and
+        unlink the temporary file if Fcall_process didn't create it in the
+        first place.
+        (Fcall_process) [MSDOS]: Don't create tempfile if stdout of the
+        child process will be redirected to a file specified with `:file'.
         Don't try to re-open tempfile in that case, and set fd[0] to -1 as
         cue to call_process_cleanup not to close that handle.
 
diff --git a/src/callproc.c b/src/callproc.c
index a966a26b938..67d0b6aede3 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -577,7 +577,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
             unlink (tempfile);
             emacs_close (filefd);
             report_file_error ("Cannot re-open temporary file",
-                               Fcons (tempfile, Qnil));
+                               Fcons (build_string (tempfile), Qnil));
           }
       }
     else