From: Chong Yidong Date: Sun, 7 Sep 2008 19:10:28 +0000 (+0000) Subject: (Fcall_process): Canonicalize current directory name. X-Git-Tag: emacs-pretest-23.0.90~2964 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db8454b07a061175d6b9a3a7d172a8ae8fdadca0;p=emacs.git (Fcall_process): Canonicalize current directory name. --- diff --git a/src/callproc.c b/src/callproc.c index 1aad176978e..fdfa4c78083 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -235,9 +235,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) #ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */ 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 */ @@ -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)); @@ -473,10 +472,6 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) emacs_close (filefd); report_file_error ("Creating process pipe", Qnil); } -#endif -#if 0 - /* Replaced by close_process_descs */ - set_exclusive_use (fd[0]); #endif }