(Fcall_process): Canonicalize current directory name.

1 files changed, 2 insertions, 7 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 1aad176978e..fdfa4c78083 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -236,9 +236,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
   char *outf, *tempfile;
   int outfilefd;
 #endif
-#if 0
-  int mask;
-#endif
   struct coding_system process_coding; /* coding-system of process output */
   struct coding_system argument_coding; /* coding-system of arguments */
   /* Set to the return value of Ffind_operation_coding_system.  */
@@ -374,6 +371,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          a sensible default. */
       current_dir = build_string ("~/");
     current_dir = expand_and_dir_to_file (current_dir, Qnil);
+    current_dir = Ffile_name_as_directory (current_dir);
+
     if (NILP (Ffile_accessible_directory_p (current_dir)))
       report_file_error ("Setting current directory",
                          Fcons (current_buffer->directory, Qnil));
@@ -474,10 +473,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
           report_file_error ("Creating process pipe", Qnil);
         }
 #endif
-#if 0
-      /* Replaced by close_process_descs */
-      set_exclusive_use (fd[0]);
-#endif
     }
 
   {