[Emacs-diffs] Changes to emacs/src/callproc.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/09/07 19:10:29

Index: callproc.c
===================================================================
RCS file: /sources/emacs/emacs/src/callproc.c,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- callproc.c  31 Jul 2008 05:33:50 -0000      1.240
+++ callproc.c  7 Sep 2008 19:10:28 -0000       1.241
@@ -236,9 +236,6 @@
   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 @@
         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 @@
          report_file_error ("Creating process pipe", Qnil);
        }
 #endif
-#if 0
-      /* Replaced by close_process_descs */
-      set_exclusive_use (fd[0]);
-#endif
     }
 
   {