*** empty log message ***

[gnu-emacs] / src / callproc.c

diff --git a/src/callproc.c b/src/callproc.c
index 9b1e04ada82c3e5eec23a404e0bedca0b15c4154..9f90e9d75379c92c2172927e35fe7f38694b8aad 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
 /* Synchronous subprocess invocation for GNU Emacs.

-   Copyright (C) 1985,86,87,88,93,94,95,99, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 
 This file is part of GNU Emacs.
 


@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 #include <config.h>
 
 
 #include <config.h>


@@ -42,7 +42,7 @@ extern int errno;
 #endif
 
 #include <sys/file.h>
 #endif
 
 #include <sys/file.h>

-#ifdef USG5
+#ifdef HAVE_FCNTL_H

 #define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif
 #define INCLUDED_FCNTL
 #include <fcntl.h>
 #endif


@@ -83,6 +83,7 @@ extern int errno;
 #include "process.h"
 #include "syssignal.h"
 #include "systty.h"
 #include "process.h"
 #include "syssignal.h"
 #include "systty.h"

+#include "blockinput.h"

 
 #ifdef MSDOS
 #include "msdos.h"
 
 #ifdef MSDOS
 #include "msdos.h"


@@ -123,13 +124,12 @@ int synch_process_alive;
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
 char *synch_process_death;
 
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
 char *synch_process_death;
 

+/* Nonzero => this is the signal number that terminated the subprocess.  */
+int synch_process_termsig;
+

 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 int synch_process_retcode;
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 int synch_process_retcode;

-
-extern Lisp_Object Vdoc_file_name;
-
-extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;

 \f
 /* Clean up when exiting Fcall_process.
    On MSDOS, delete the temporary file on any kind of termination.
 \f
 /* Clean up when exiting Fcall_process.
    On MSDOS, delete the temporary file on any kind of termination.


@@ -213,13 +213,15 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      int nargs;
      register Lisp_Object *args;
 {
      int nargs;
      register Lisp_Object *args;
 {

-  Lisp_Object infile, buffer, current_dir, display, path;
+  Lisp_Object infile, buffer, current_dir, path;
+  int display_p;

   int fd[2];
   int filefd;
   register int pid;
   int fd[2];
   int filefd;
   register int pid;

-  char buf[16384];
-  char *bufptr = buf;
-  int bufsize = 16384;
+#define CALLPROC_BUFFER_SIZE_MIN (16 * 1024)
+#define CALLPROC_BUFFER_SIZE_MAX (4 * CALLPROC_BUFFER_SIZE_MIN)
+  char buf[CALLPROC_BUFFER_SIZE_MAX];
+  int bufsize = CALLPROC_BUFFER_SIZE_MIN;

   int count = SPECPDL_INDEX ();
 
   register const unsigned char **new_argv
   int count = SPECPDL_INDEX ();
 
   register const unsigned char **new_argv


@@ -253,7 +255,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
 #ifndef subprocesses
   /* Without asynchronous processes we cannot have BUFFER == 0.  */
 
 #ifndef subprocesses
   /* Without asynchronous processes we cannot have BUFFER == 0.  */

-  if (nargs >= 3 
+  if (nargs >= 3

       && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2])))
     error ("Operating system cannot handle asynchronous subprocesses");
 #endif /* subprocesses */
       && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2])))
     error ("Operating system cannot handle asynchronous subprocesses");
 #endif /* subprocesses */


@@ -339,7 +341,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          CHECK_BUFFER (buffer);
        }
     }
          CHECK_BUFFER (buffer);
        }
     }

-  else 
+  else

     buffer = Qnil;
 
   /* Make sure that the child will be able to chdir to the current
     buffer = Qnil;
 
   /* Make sure that the child will be able to chdir to the current


@@ -353,11 +355,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      protected by the caller, so all we really have to worry about is
      buffer.  */
   {
      protected by the caller, so all we really have to worry about is
      buffer.  */
   {

-    struct gcpro gcpro1, gcpro2, gcpro3;
+    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;

 
     current_dir = current_buffer->directory;
 
 
     current_dir = current_buffer->directory;
 

-    GCPRO3 (infile, buffer, current_dir);
+    GCPRO4 (infile, buffer, current_dir, error_file);

 
     current_dir
       = expand_and_dir_to_file (Funhandled_file_name_directory (current_dir),
 
     current_dir
       = expand_and_dir_to_file (Funhandled_file_name_directory (current_dir),


@@ -366,14 +368,21 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       report_file_error ("Setting current directory",
                         Fcons (current_buffer->directory, Qnil));
 
       report_file_error ("Setting current directory",
                         Fcons (current_buffer->directory, Qnil));
 

+    if (STRING_MULTIBYTE (infile))
+      infile = ENCODE_FILE (infile);
+    if (STRING_MULTIBYTE (current_dir))
+      current_dir = ENCODE_FILE (current_dir);
+    if (STRINGP (error_file) && STRING_MULTIBYTE (error_file))
+      error_file = ENCODE_FILE (error_file);

     UNGCPRO;
   }
 
     UNGCPRO;
   }
 

-  display = nargs >= 4 ? args[3] : Qnil;
+  display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]);

 
   filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
   if (filefd < 0)
     {
 
   filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
   if (filefd < 0)
     {

+      infile = DECODE_FILE (infile);

       report_file_error ("Opening process input file", Fcons (infile, Qnil));
     }
   /* Search for program; barf if not found.  */
       report_file_error ("Opening process input file", Fcons (infile, Qnil));
     }
   /* Search for program; barf if not found.  */


@@ -389,6 +398,13 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       emacs_close (filefd);
       report_file_error ("Searching for program", Fcons (args[0], Qnil));
     }
       emacs_close (filefd);
       report_file_error ("Searching for program", Fcons (args[0], Qnil));
     }

+
+  /* If program file name starts with /: for quoting a magic name,
+     discard that.  */
+  if (SBYTES (path) > 2 && SREF (path, 0) == '/'
+      && SREF (path, 1) == ':')
+    path = Fsubstring (path, make_number (2), Qnil);
+

   new_argv[0] = SDATA (path);
   if (nargs > 4)
     {
   new_argv[0] = SDATA (path);
   if (nargs > 4)
     {


@@ -424,7 +440,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       *tempfile = '\0';
     }
   dostounix_filename (tempfile);
       *tempfile = '\0';
     }
   dostounix_filename (tempfile);

-  if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/') 
+  if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/')

     strcat (tempfile, "/");
   strcat (tempfile, "detmp.XXX");
   mktemp (tempfile);
     strcat (tempfile, "/");
   strcat (tempfile, "detmp.XXX");
   mktemp (tempfile);


@@ -499,6 +515,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        to avoid timing error if process terminates soon.  */
     synch_process_death = 0;
     synch_process_retcode = 0;
        to avoid timing error if process terminates soon.  */
     synch_process_death = 0;
     synch_process_retcode = 0;

+    synch_process_termsig = 0;

 
     if (NILP (error_file))
       fd_error = emacs_open (NULL_DEVICE, O_WRONLY, 0);
 
     if (NILP (error_file))
       fd_error = emacs_open (NULL_DEVICE, O_WRONLY, 0);


@@ -523,14 +540,13 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 #ifdef MSDOS
        unlink (tempfile);
 #endif
 #ifdef MSDOS
        unlink (tempfile);
 #endif

-       report_file_error ("Cannot redirect stderr",
-                          Fcons ((NILP (error_file)
-                                  ? build_string (NULL_DEVICE) : error_file),
-                                 Qnil));
+       if (NILP (error_file))
+         error_file = build_string (NULL_DEVICE);
+       else if (STRINGP (error_file))
+         error_file = DECODE_FILE (error_file);
+       report_file_error ("Cannot redirect stderr", Fcons (error_file, Qnil));

       }
 
       }
 

-    current_dir = ENCODE_FILE (current_dir);
-

 #ifdef MAC_OS8
     {
       /* Call run_mac_command in sysdep.c here directly instead of doing
 #ifdef MAC_OS8
     {
       /* Call run_mac_command in sysdep.c here directly instead of doing


@@ -538,7 +554,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          code does not handle passing the environment to the synchronous
          Mac subprocess.  */
       char *infn, *outfn, *errfn, *currdn;
          code does not handle passing the environment to the synchronous
          Mac subprocess.  */
       char *infn, *outfn, *errfn, *currdn;

-      
+

       /* close these files so subprocess can write to them */
       close (outfilefd);
       if (fd_error != outfilefd)
       /* close these files so subprocess can write to them */
       close (outfilefd);
       if (fd_error != outfilefd)


@@ -612,6 +628,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     pid = child_setup (filefd, fd1, fd_error, (char **) new_argv,
                       0, current_dir);
 #else  /* not WINDOWSNT */
     pid = child_setup (filefd, fd1, fd_error, (char **) new_argv,
                       0, current_dir);
 #else  /* not WINDOWSNT */

+    BLOCK_INPUT;
+

     pid = vfork ();
 
     if (pid == 0)
     pid = vfork ();
 
     if (pid == 0)


@@ -629,6 +647,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        child_setup (filefd, fd1, fd_error, (char **) new_argv,
                     0, current_dir);
       }
        child_setup (filefd, fd1, fd_error, (char **) new_argv,
                     0, current_dir);
       }

+
+    UNBLOCK_INPUT;

 #endif /* not WINDOWSNT */
 
     /* The MSDOS case did this already.  */
 #endif /* not WINDOWSNT */
 
     /* The MSDOS case did this already.  */


@@ -736,7 +756,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     int first = 1;
     int total_read = 0;
     int carryover = 0;
     int first = 1;
     int total_read = 0;
     int carryover = 0;

-    int display_on_the_fly = !NILP (display) && INTERACTIVE;
+    int display_on_the_fly = display_p;

     struct coding_system saved_coding;
     int pt_orig = PT, pt_byte_orig = PT_BYTE;
     int inserted;
     struct coding_system saved_coding;
     int pt_orig = PT, pt_byte_orig = PT_BYTE;
     int inserted;


@@ -752,7 +772,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        nread = carryover;
        while (nread < bufsize - 1024)
          {
        nread = carryover;
        while (nread < bufsize - 1024)
          {

-           int this_read = emacs_read (fd[0], bufptr + nread,
+           int this_read = emacs_read (fd[0], buf + nread,

                                        bufsize - nread);
 
            if (this_read < 0)
                                        bufsize - nread);
 
            if (this_read < 0)


@@ -773,11 +793,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
        /* Now NREAD is the total amount of data in the buffer.  */
        immediate_quit = 0;
 
        /* Now NREAD is the total amount of data in the buffer.  */
        immediate_quit = 0;

-       
+

        if (!NILP (buffer))
          {
            if (! CODING_MAY_REQUIRE_DECODING (&process_coding))
        if (!NILP (buffer))
          {
            if (! CODING_MAY_REQUIRE_DECODING (&process_coding))

-             insert_1_both (bufptr, nread, nread, 0, 1, 0);
+             insert_1_both (buf, nread, nread, 0, 1, 0);

            else
              {                 /* We have to decode the input.  */
                int size;
            else
              {                 /* We have to decode the input.  */
                int size;


@@ -786,7 +806,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
              repeat_decoding:
                size = decoding_buffer_size (&process_coding, nread);
                decoding_buf = (char *) xmalloc (size);
              repeat_decoding:
                size = decoding_buffer_size (&process_coding, nread);
                decoding_buf = (char *) xmalloc (size);

-               
+

                /* We can't use the macro CODING_REQUIRE_DETECTION
                   because it always returns nonzero if the coding
                   system requires EOL detection.  Here, we have to
                /* We can't use the macro CODING_REQUIRE_DETECTION
                   because it always returns nonzero if the coding
                   system requires EOL detection.  Here, we have to


@@ -794,31 +814,36 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
                   requires text-encoding detection.  */
                if (process_coding.type == coding_type_undecided)
                  {
                   requires text-encoding detection.  */
                if (process_coding.type == coding_type_undecided)
                  {

-                   detect_coding (&process_coding, bufptr, nread);
+                   detect_coding (&process_coding, buf, nread);

                    if (process_coding.composing != COMPOSITION_DISABLED)
                    if (process_coding.composing != COMPOSITION_DISABLED)

+                     /* We have not yet allocated the composition
+                        data because the coding type was undecided.  */

                      coding_allocate_composition_data (&process_coding, PT);
                  }
                if (process_coding.cmp_data)
                  process_coding.cmp_data->char_offset = PT;
                      coding_allocate_composition_data (&process_coding, PT);
                  }
                if (process_coding.cmp_data)
                  process_coding.cmp_data->char_offset = PT;

-               
-               decode_coding (&process_coding, bufptr, decoding_buf,
+
+               decode_coding (&process_coding, buf, decoding_buf,

                               nread, size);
                               nread, size);

-               
+

                if (display_on_the_fly
                    && saved_coding.type == coding_type_undecided
                    && process_coding.type != coding_type_undecided)
                  {
                    /* We have detected some coding system.  But,
                       there's a possibility that the detection was
                if (display_on_the_fly
                    && saved_coding.type == coding_type_undecided
                    && process_coding.type != coding_type_undecided)
                  {
                    /* We have detected some coding system.  But,
                       there's a possibility that the detection was

-                      done by insufficient data.  So, we give up
-                      displaying on the fly.  */
+                      done by insufficient data.  So, we try the code
+                      detection again with more data.  */

                    xfree (decoding_buf);
                    display_on_the_fly = 0;
                    process_coding = saved_coding;
                    carryover = nread;
                    xfree (decoding_buf);
                    display_on_the_fly = 0;
                    process_coding = saved_coding;
                    carryover = nread;

+                   /* This is to make the above condition always
+                      fails in the future.  */
+                   saved_coding.type = coding_type_no_conversion;

                    continue;
                  }
                    continue;
                  }

-               
+

                if (process_coding.produced > 0)
                  insert_1_both (decoding_buf, process_coding.produced_char,
                                 process_coding.produced, 0, 1, 0);
                if (process_coding.produced > 0)
                  insert_1_both (decoding_buf, process_coding.produced_char,
                                 process_coding.produced, 0, 1, 0);


@@ -833,9 +858,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
                        /* CRs have been replaced with LFs.  Undo
                           that in the text inserted above.  */
                        unsigned char *p;
                        /* CRs have been replaced with LFs.  Undo
                           that in the text inserted above.  */
                        unsigned char *p;

-                       
+

                        move_gap_both (PT, PT_BYTE);
                        move_gap_both (PT, PT_BYTE);

-                       
+

                        p = BYTE_POS_ADDR (pt_byte_orig);
                        for (; p < GPT_ADDR; ++p)
                          if (*p == '\n')
                        p = BYTE_POS_ADDR (pt_byte_orig);
                        for (; p < GPT_ADDR; ++p)
                          if (*p == '\n')


@@ -851,7 +876,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
                        old_pt = PT;
                        old_pt_byte = PT_BYTE;
                        nCR = 0;
                        old_pt = PT;
                        old_pt_byte = PT_BYTE;
                        nCR = 0;

-                       
+

                        for (bytepos = PT_BYTE - 1;
                             bytepos >= pt_byte_orig;
                             --bytepos)
                        for (bytepos = PT_BYTE - 1;
                             bytepos >= pt_byte_orig;
                             --bytepos)


@@ -875,19 +900,19 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
                      coding = AREF (eol_type, CODING_EOL_LF);
                    else
                      coding = saved_coding.symbol;
                      coding = AREF (eol_type, CODING_EOL_LF);
                    else
                      coding = saved_coding.symbol;

-                   
+

                    process_coding.symbol = coding;
                    process_coding.eol_type = CODING_EOL_LF;
                    process_coding.mode
                      &= ~CODING_MODE_INHIBIT_INCONSISTENT_EOL;
                  }
                    process_coding.symbol = coding;
                    process_coding.eol_type = CODING_EOL_LF;
                    process_coding.mode
                      &= ~CODING_MODE_INHIBIT_INCONSISTENT_EOL;
                  }

-               
+

                nread -= process_coding.consumed;
                carryover = nread;
                if (carryover > 0)
                  /* As CARRYOVER should not be that large, we had
                     better avoid overhead of bcopy.  */
                nread -= process_coding.consumed;
                carryover = nread;
                if (carryover > 0)
                  /* As CARRYOVER should not be that large, we had
                     better avoid overhead of bcopy.  */

-                 BCOPY_SHORT (bufptr + process_coding.consumed, bufptr,
+                 BCOPY_SHORT (buf + process_coding.consumed, buf,

                               carryover);
                if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP)
                  {
                               carryover);
                if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP)
                  {


@@ -904,24 +929,24 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        if (process_coding.mode & CODING_MODE_LAST_BLOCK)
          break;
 
        if (process_coding.mode & CODING_MODE_LAST_BLOCK)
          break;
 

+#if (CALLPROC_BUFFER_SIZE_MIN != CALLPROC_BUFFER_SIZE_MAX)

        /* Make the buffer bigger as we continue to read more data,
        /* Make the buffer bigger as we continue to read more data,

-          but not past 64k.  */
-       if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
-         {
-           char *tempptr;
-           bufsize *= 2;
-
-           tempptr = (char *) alloca (bufsize);
-           bcopy (bufptr, tempptr, bufsize / 2);
-           bufptr = tempptr;
-         }
+          but not past CALLPROC_BUFFER_SIZE_MAX.  */
+       if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize)
+         if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX)
+           bufsize = CALLPROC_BUFFER_SIZE_MAX;
+#endif

 
 

-       if (!NILP (display) && INTERACTIVE)
+       if (display_p)

          {
            if (first)
              prepare_menu_bars ();
            first = 0;
            redisplay_preserve_echo_area (1);
          {
            if (first)
              prepare_menu_bars ();
            first = 0;
            redisplay_preserve_echo_area (1);

+           /* This variable might have been set to 0 for code
+              detection.  In that case, we set it back to 1 because
+              we should have already detected a coding system.  */
+           display_on_the_fly = 1;

          }
        immediate_quit = 1;
        QUIT;
          }
        immediate_quit = 1;
        QUIT;


@@ -970,6 +995,19 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
   unbind_to (count, Qnil);
 
 
   unbind_to (count, Qnil);
 

+  if (synch_process_termsig)
+    {
+      char *signame;
+
+      synchronize_system_messages_locale ();
+      signame = strsignal (synch_process_termsig);
+
+      if (signame == 0)
+        signame = "unknown";
+
+      synch_process_death = signame;
+    }
+

   if (synch_process_death)
     return code_convert_string_norecord (build_string (synch_process_death),
                                         Vlocale_coding_system, 0);
   if (synch_process_death)
     return code_convert_string_norecord (build_string (synch_process_death),
                                         Vlocale_coding_system, 0);


@@ -981,9 +1019,11 @@ static Lisp_Object
 delete_temp_file (name)
      Lisp_Object name;
 {
 delete_temp_file (name)
      Lisp_Object name;
 {

-  /* Use Fdelete_file (indirectly) because that runs a file name handler.
-     We did that when writing the file, so we should do so when deleting.  */
+  /* Suppress jka-compr handling, etc.  */
+  int count = SPECPDL_INDEX ();
+  specbind (intern ("file-name-handler-alist"), Qnil);

   internal_delete_file (name);
   internal_delete_file (name);

+  unbind_to (count, Qnil);

   return Qnil;
 }
 
   return Qnil;
 }
 


@@ -1004,7 +1044,7 @@ t (mix it with ordinary output), or a file name string.
 Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted.
 Remaining args are passed to PROGRAM at startup as command args.
 
 Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted.
 Remaining args are passed to PROGRAM at startup as command args.
 

-If BUFFER is nil, `call-process-region' returns immediately with value nil.
+If BUFFER is 0, `call-process-region' returns immediately with value nil.

 Otherwise it waits for PROGRAM to terminate
 and returns a numeric exit status or a signal description string.
 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
 Otherwise it waits for PROGRAM to terminate
 and returns a numeric exit status or a signal description string.
 If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.


@@ -1094,12 +1134,15 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
     int count1 = SPECPDL_INDEX ();
 
     specbind (intern ("coding-system-for-write"), val);
     int count1 = SPECPDL_INDEX ();
 
     specbind (intern ("coding-system-for-write"), val);

+    /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we
+       happen to get a ".Z" suffix.  */
+    specbind (intern ("file-name-handler-alist"), Qnil);

     Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil);
 
     unbind_to (count1, Qnil);
   }
 
     Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil);
 
     unbind_to (count1, Qnil);
   }
 

-  /* Note that Fcall_process takes care of binding 
+  /* Note that Fcall_process takes care of binding

      coding-system-for-read.  */
 
   record_unwind_protect (delete_temp_file, filename_string);
      coding-system-for-read.  */
 
   record_unwind_protect (delete_temp_file, filename_string);


@@ -1137,7 +1180,7 @@ static int relocate_fd ();
    of environ around the vfork and the call to this function.
 
    SET_PGRP is nonzero if we should put the subprocess into a separate
    of environ around the vfork and the call to this function.
 
    SET_PGRP is nonzero if we should put the subprocess into a separate

-   process group.  
+   process group.

 
    CURRENT_DIR is an elisp string giving the path of the current
    directory the subprocess should have.  Since we can't really signal
 
    CURRENT_DIR is an elisp string giving the path of the current
    directory the subprocess should have.  Since we can't really signal


@@ -1460,7 +1503,7 @@ egetenv (var)
 #endif /* not VMS */
 \f
 /* This is run before init_cmdargs.  */
 #endif /* not VMS */
 \f
 /* This is run before init_cmdargs.  */

-  
+

 void
 init_callproc_1 ()
 {
 void
 init_callproc_1 ()
 {


@@ -1468,7 +1511,7 @@ init_callproc_1 ()
   char *doc_dir = egetenv ("EMACSDOC");
 
   Vdata_directory
   char *doc_dir = egetenv ("EMACSDOC");
 
   Vdata_directory

-    = Ffile_name_as_directory (build_string (data_dir ? data_dir 
+    = Ffile_name_as_directory (build_string (data_dir ? data_dir

                                             : PATH_DATA));
   Vdoc_directory
     = Ffile_name_as_directory (build_string (doc_dir ? doc_dir
                                             : PATH_DATA));
   Vdoc_directory
     = Ffile_name_as_directory (build_string (doc_dir ? doc_dir


@@ -1487,7 +1530,7 @@ void
 init_callproc ()
 {
   char *data_dir = egetenv ("EMACSDATA");
 init_callproc ()
 {
   char *data_dir = egetenv ("EMACSDATA");

-    
+

   register char * sh;
   Lisp_Object tempdir;
 
   register char * sh;
   Lisp_Object tempdir;
 


@@ -1505,7 +1548,7 @@ init_callproc ()
          Vexec_path = Fcons (tem, Vexec_path);
          Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
        }
          Vexec_path = Fcons (tem, Vexec_path);
          Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
        }

-      
+

       Vexec_directory = Ffile_name_as_directory (tem);
 #endif /* not DOS_NT */
 
       Vexec_directory = Ffile_name_as_directory (tem);
 #endif /* not DOS_NT */
 


@@ -1580,6 +1623,14 @@ init_callproc ()
   else
     Vtemp_file_name_pattern = build_string ("/tmp/emacsXXXXXX");
 #endif
   else
     Vtemp_file_name_pattern = build_string ("/tmp/emacsXXXXXX");
 #endif

+
+#ifdef DOS_NT
+  Vshared_game_score_directory = Qnil;
+#else
+  Vshared_game_score_directory = build_string (PATH_GAME);
+  if (NILP (Ffile_directory_p (Vshared_game_score_directory)))
+    Vshared_game_score_directory = Qnil;
+#endif

 }
 
 void
 }
 
 void


@@ -1640,10 +1691,10 @@ includes this.  */);
   DEFVAR_LISP ("shared-game-score-directory", &Vshared_game_score_directory,
               doc: /* Directory of score files for games which come with GNU Emacs.
 If this variable is nil, then Emacs is unable to use a shared directory.  */);
   DEFVAR_LISP ("shared-game-score-directory", &Vshared_game_score_directory,
               doc: /* Directory of score files for games which come with GNU Emacs.
 If this variable is nil, then Emacs is unable to use a shared directory.  */);

-#ifdef HAVE_SHARED_GAME_DIR
-  Vshared_game_score_directory = build_string(HAVE_SHARED_GAME_DIR);
-#else
+#ifdef DOS_NT

   Vshared_game_score_directory = Qnil;
   Vshared_game_score_directory = Qnil;

+#else
+  Vshared_game_score_directory = build_string (PATH_GAME);

 #endif
 
   DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
 #endif
 
   DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,


@@ -1657,7 +1708,10 @@ Each element should be a string of the form ENVVARNAME=VALUE.
 If multiple entries define the same variable, the first one always
 takes precedence.
 The environment which Emacs inherits is placed in this variable
 If multiple entries define the same variable, the first one always
 takes precedence.
 The environment which Emacs inherits is placed in this variable

-when Emacs starts.  */);
+when Emacs starts.
+Non-ASCII characters are encoded according to the initial value of
+`locale-coding-system', i.e. the elements must normally be decoded for use.
+See `setenv' and `getenv'.  */);

 
 #ifndef VMS
   defsubr (&Scall_process);
 
 #ifndef VMS
   defsubr (&Scall_process);


@@ -1665,3 +1719,6 @@ when Emacs starts.  */);
 #endif
   defsubr (&Scall_process_region);
 }
 #endif
   defsubr (&Scall_process_region);
 }

+
+/* arch-tag: 769b8045-1df7-4d2b-8968-e3fb49017f95
+   (do not change this comment) */