Merge from mainline.

5 files changed, 302 insertions, 185 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 75917224ca9..c237ba24b0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -92,6 +92,40 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * sysdep.c (get_tty_size) [WINDOWSNT]: Implement.  (Bug#8596)
+
+2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnutls.c (Qgnutls_log_level, Qgnutls_code, Qgnutls_anon)
+        (Qgnutls_x509pki, Qgnutls_e_interrupted, Qgnutls_e_again)
+        (Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake)
+        (gnutls_global_initialized, Qgnutls_bootprop_priority)
+        (Qgnutls_bootprop_trustfiles, Qgnutls_bootprop_keyfiles)
+        (Qgnutls_bootprop_callbacks, Qgnutls_bootprop_loglevel)
+        (Qgnutls_bootprop_hostname, Qgnutls_bootprop_verify_flags)
+        (Qgnutls_bootprop_verify_error, Qgnutls_bootprop_verify_hostname_error)
+        (Qgnutls_bootprop_callbacks_verify): Make static.
+
+2011-05-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * callproc.c: Indentation fixup.
+
+        * sysdep.c (wait_for_termination_1): Make static.
+        (wait_for_termination, interruptible_wait_for_termination): Move
+        after wait_for_termination_1.
+
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * sysdep.c (interruptible_wait_for_termination): New function
+        which is like wait_for_termination, but allows keyboard
+        interruptions.
+
+        * callproc.c (Fcall_process): Add (:file "file") as an option for
+        the STDOUT buffer.
+        (Fcall_process_region): Ditto.
+
 2011-04-30  Eli Zaretskii  <eliz@gnu.org>
 
         * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
diff --git a/src/callproc.c b/src/callproc.c
index 3726eb3cc7f..4a29e95b356 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
    Copyright (C) 1985-1988, 1993-1995, 1999-2011
-                 Free Software Foundation, Inc.
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -156,8 +156,9 @@ DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
        doc: /* Call PROGRAM synchronously in separate process.
 The remaining arguments are optional.
 The program's input comes from file INFILE (nil means `/dev/null').
-Insert output in BUFFER before point; t means current buffer;
- nil for BUFFER means discard it; 0 means discard and don't wait.
+Insert output in BUFFER before point; t means current buffer; nil for BUFFER
+ means discard it; 0 means discard and don't wait; and `(:file FILE)', where
+ FILE is a file name string, means that it should be written to that file.
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
@@ -196,14 +197,17 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
   /* File to use for stderr in the child.
      t means use same as standard output.  */
   Lisp_Object error_file;
+  Lisp_Object output_file = Qnil;
 #ifdef MSDOS    /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
   char *outf, *tempfile;
   int outfilefd;
 #endif
+  int fd_output = -1;
   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.  */
   Lisp_Object coding_systems;
+  int output_to_buffer = 1;
 
   /* Qt denotes that Ffind_operation_coding_system is not yet called.  */
   coding_systems = Qt;
@@ -273,9 +277,12 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     {
       buffer = args[2];
 
-      /* If BUFFER is a list, its meaning is
-         (BUFFER-FOR-STDOUT FILE-FOR-STDERR).  */
-      if (CONSP (buffer))
+      /* If BUFFER is a list, its meaning is (BUFFER-FOR-STDOUT
+         FILE-FOR-STDERR), unless the first element is :file, in which case see
+         the next paragraph. */
+      if (CONSP (buffer)
+          && (! SYMBOLP (XCAR (buffer))
+              || strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file")))
         {
           if (CONSP (XCDR (buffer)))
             {
@@ -291,6 +298,17 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
           buffer = XCAR (buffer);
         }
 
+      /* If the buffer is (still) a list, it might be a (:file "file") spec. */
+      if (CONSP (buffer)
+          && SYMBOLP (XCAR (buffer))
+          && ! strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file"))
+        {
+          output_file = Fexpand_file_name (XCAR (XCDR (buffer)),
+                                           BVAR (current_buffer, directory));
+          CHECK_STRING (output_file);
+          buffer = Qnil;
+        }
+
       if (!(EQ (buffer, Qnil)
             || EQ (buffer, Qt)
             || INTEGERP (buffer)))
@@ -318,11 +336,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.  */
   {
-    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
 
     current_dir = BVAR (current_buffer, directory);
 
-    GCPRO4 (infile, buffer, current_dir, error_file);
+    GCPRO5 (infile, buffer, current_dir, error_file, output_file);
 
     current_dir = Funhandled_file_name_directory (current_dir);
     if (NILP (current_dir))
@@ -342,6 +360,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       current_dir = ENCODE_FILE (current_dir);
     if (STRINGP (error_file) && STRING_MULTIBYTE (error_file))
       error_file = ENCODE_FILE (error_file);
+    if (STRINGP (output_file) && STRING_MULTIBYTE (output_file))
+      output_file = ENCODE_FILE (output_file);
     UNGCPRO;
   }
 
@@ -353,6 +373,26 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       infile = DECODE_FILE (infile);
       report_file_error ("Opening process input file", Fcons (infile, Qnil));
     }
+
+  if (STRINGP (output_file))
+    {
+#ifdef DOS_NT
+      fd_output = emacs_open (SSDATA (output_file),
+                              O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
+                              S_IREAD | S_IWRITE);
+#else  /* not DOS_NT */
+      fd_output = creat (SSDATA (output_file), 0666);
+#endif /* not DOS_NT */
+      if (fd_output < 0)
+        {
+          output_file = DECODE_FILE (output_file);
+          report_file_error ("Opening process output file",
+                             Fcons (output_file, Qnil));
+        }
+      if (STRINGP (error_file) || NILP (error_file))
+        output_to_buffer = 0;
+    }
+
   /* Search for program; barf if not found.  */
   {
     struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
@@ -413,13 +453,18 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
   strcat (tempfile, "detmp.XXX");
   mktemp (tempfile);
 
-  outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
-  if (outfilefd < 0)
+  /* If we're redirecting STDOUT to a file, this is already opened. */
+  if (fd_output < 0)
     {
-      emacs_close (filefd);
-      report_file_error ("Opening process output file",
-                         Fcons (build_string (tempfile), Qnil));
+      outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
+      if (outfilefd < 0) {
+        emacs_close (filefd);
+        report_file_error ("Opening process output file",
+                           Fcons (build_string (tempfile), Qnil));
+      }
     }
+  else
+    outfilefd = fd_output;
   fd[0] = filefd;
   fd[1] = outfilefd;
 #endif /* MSDOS */
@@ -450,6 +495,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     struct sigaction sigpipe_action;
 #endif
 
+    if (fd_output >= 0)
+      fd1 = fd_output;
 #if 0  /* Some systems don't have sigblock.  */
     mask = sigblock (sigmask (SIGCHLD));
 #endif
@@ -552,12 +599,12 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
         if (fd[0] >= 0)
           emacs_close (fd[0]);
 #ifdef HAVE_SETSID
-        setsid ();
+        setsid ();
 #endif
 #if defined (USG)
-        setpgrp ();
+        setpgrp ();
 #else
-        setpgrp (pid, pid);
+        setpgrp (pid, pid);
 #endif /* USG */
 
         /* GConf causes us to ignore SIGPIPE, make sure it is restored
@@ -591,6 +638,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     /* Close most of our fd's, but not fd[0]
        since we will use that to read input from.  */
     emacs_close (filefd);
+    if (fd_output >= 0)
+      emacs_close (fd_output);
     if (fd1 >= 0 && fd1 != fd_error)
       emacs_close (fd1);
   }
@@ -673,136 +722,140 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
   immediate_quit = 1;
   QUIT;
 
-  {
-    register EMACS_INT nread;
-    int first = 1;
-    EMACS_INT total_read = 0;
-    int carryover = 0;
-    int display_p = display_p_volatile;
-    int display_on_the_fly = display_p;
-    struct coding_system saved_coding;
-
-    saved_coding = process_coding;
-    while (1)
-      {
-        /* Repeatedly read until we've filled as much as possible
-           of the buffer size we have.  But don't read
-           less than 1024--save that for the next bufferful.  */
-        nread = carryover;
-        while (nread < bufsize - 1024)
-          {
-            int this_read = emacs_read (fd[0], buf + nread,
-                                        bufsize - nread);
+  if (output_to_buffer)
+    {
+      register EMACS_INT nread;
+      int first = 1;
+      EMACS_INT total_read = 0;
+      int carryover = 0;
+      int display_p = display_p_volatile;
+      int display_on_the_fly = display_p;
+      struct coding_system saved_coding;
+
+      saved_coding = process_coding;
+      while (1)
+        {
+          /* Repeatedly read until we've filled as much as possible
+             of the buffer size we have.  But don't read
+             less than 1024--save that for the next bufferful.  */
+          nread = carryover;
+          while (nread < bufsize - 1024)
+            {
+              int this_read = emacs_read (fd[0], buf + nread,
+                                          bufsize - nread);
 
-            if (this_read < 0)
-              goto give_up;
+              if (this_read < 0)
+                goto give_up;
 
-            if (this_read == 0)
-              {
-                process_coding.mode |= CODING_MODE_LAST_BLOCK;
-                break;
-              }
+              if (this_read == 0)
+                {
+                  process_coding.mode |= CODING_MODE_LAST_BLOCK;
+                  break;
+                }
 
-            nread += this_read;
-            total_read += this_read;
+              nread += this_read;
+              total_read += this_read;
 
-            if (display_on_the_fly)
-              break;
-          }
+              if (display_on_the_fly)
+                break;
+            }
 
-        /* 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 (NILP (BVAR (current_buffer, enable_multibyte_characters))
-                && ! CODING_MAY_REQUIRE_DECODING (&process_coding))
-              insert_1_both (buf, nread, nread, 0, 1, 0);
-            else
-              {                 /* We have to decode the input.  */
-                Lisp_Object curbuf;
-                int count1 = SPECPDL_INDEX ();
-
-                XSETBUFFER (curbuf, current_buffer);
-                /* We cannot allow after-change-functions be run
-                   during decoding, because that might modify the
-                   buffer, while we rely on process_coding.produced to
-                   faithfully reflect inserted text until we
-                   TEMP_SET_PT_BOTH below.  */
-                specbind (Qinhibit_modification_hooks, Qt);
-                decode_coding_c_string (&process_coding, (unsigned char *) buf,
-                                        nread, curbuf);
-                unbind_to (count1, Qnil);
-                if (display_on_the_fly
-                    && CODING_REQUIRE_DETECTION (&saved_coding)
-                    && ! CODING_REQUIRE_DETECTION (&process_coding))
-                  {
-                    /* 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.  */
-                    if (process_coding.produced > 0)
-                      del_range_2 (process_coding.dst_pos,
-                                   process_coding.dst_pos_byte,
-                                   process_coding.dst_pos
-                                   + process_coding.produced_char,
-                                   process_coding.dst_pos_byte
-                                   + process_coding.produced, 0);
-                    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.common_flags
-                      &= ~CODING_REQUIRE_DETECTION_MASK;
-                    continue;
-                  }
-
-                TEMP_SET_PT_BOTH (PT + process_coding.produced_char,
-                                  PT_BYTE + process_coding.produced);
-                carryover = process_coding.carryover_bytes;
-                if (carryover > 0)
-                  memcpy (buf, process_coding.carryover,
-                          process_coding.carryover_bytes);
-              }
-          }
+          if (!NILP (buffer))
+            {
+              if (NILP (BVAR (current_buffer, enable_multibyte_characters))
+                  && ! CODING_MAY_REQUIRE_DECODING (&process_coding))
+                insert_1_both (buf, nread, nread, 0, 1, 0);
+              else
+                {                       /* We have to decode the input.  */
+                  Lisp_Object curbuf;
+                  int count1 = SPECPDL_INDEX ();
+
+                  XSETBUFFER (curbuf, current_buffer);
+                  /* We cannot allow after-change-functions be run
+                     during decoding, because that might modify the
+                     buffer, while we rely on process_coding.produced to
+                     faithfully reflect inserted text until we
+                     TEMP_SET_PT_BOTH below.  */
+                  specbind (Qinhibit_modification_hooks, Qt);
+                  decode_coding_c_string (&process_coding,
+                                          (unsigned char *) buf, nread, curbuf);
+                  unbind_to (count1, Qnil);
+                  if (display_on_the_fly
+                      && CODING_REQUIRE_DETECTION (&saved_coding)
+                      && ! CODING_REQUIRE_DETECTION (&process_coding))
+                    {
+                      /* 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.  */
+                      if (process_coding.produced > 0)
+                        del_range_2 (process_coding.dst_pos,
+                                     process_coding.dst_pos_byte,
+                                     process_coding.dst_pos
+                                     + process_coding.produced_char,
+                                     process_coding.dst_pos_byte
+                                     + process_coding.produced, 0);
+                      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.common_flags
+                        &= ~CODING_REQUIRE_DETECTION_MASK;
+                      continue;
+                    }
+
+                  TEMP_SET_PT_BOTH (PT + process_coding.produced_char,
+                                    PT_BYTE + process_coding.produced);
+                  carryover = process_coding.carryover_bytes;
+                  if (carryover > 0)
+                    memcpy (buf, process_coding.carryover,
+                            process_coding.carryover_bytes);
+                }
+            }
 
-        if (process_coding.mode & CODING_MODE_LAST_BLOCK)
-          break;
+          if (process_coding.mode & CODING_MODE_LAST_BLOCK)
+            break;
 
-        /* Make the buffer bigger as we continue to read more data,
-           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;
+          /* Make the buffer bigger as we continue to read more data,
+             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;
 
-        if (display_p)
-          {
-            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;
-      }
-  give_up: ;
-
-    Vlast_coding_system_used = CODING_ID_NAME (process_coding.id);
-    /* If the caller required, let the buffer inherit the
-       coding-system used to decode the process output.  */
-    if (inherit_process_coding_system)
-      call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
-             make_number (total_read));
-  }
+          if (display_p)
+            {
+              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;
+        }
+    give_up: ;
+
+      Vlast_coding_system_used = CODING_ID_NAME (process_coding.id);
+      /* If the caller required, let the buffer inherit the
+         coding-system used to decode the process output.  */
+      if (inherit_process_coding_system)
+        call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
+               make_number (total_read));
+    }
 
 #ifndef MSDOS
   /* Wait for it to terminate, unless it already has.  */
-  wait_for_termination (pid);
+  if (output_to_buffer)
+    wait_for_termination (pid);
+  else
+    interruptible_wait_for_termination (pid);
 #endif
 
   immediate_quit = 0;
@@ -822,7 +875,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
       signame = strsignal (synch_process_termsig);
 
       if (signame == 0)
-        signame = "unknown";
+        signame = "unknown";
 
       synch_process_death = signame;
     }
@@ -850,8 +903,10 @@ DEFUN ("call-process-region", Fcall_process_region, Scall_process_region,
 The remaining arguments are optional.
 Delete the text if fourth arg DELETE is non-nil.
 
-Insert output in BUFFER before point; t means current buffer;
- nil for BUFFER means discard it; 0 means discard and don't wait.
+Insert output in BUFFER before point; t means current buffer; nil for
+ BUFFER means discard it; 0 means discard and don't wait; and `(:file
+ FILE)', where FILE is a file name string, means that it should be
+ written to that file.
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
@@ -1003,18 +1058,18 @@ add_env (char **env, char **new_env, char *string)
     {
       char *p = *ep, *q = string;
       while (ok)
-        {
-          if (*q != *p)
-            break;
-          if (*q == 0)
-            /* The string is a lone variable name; keep it for now, we
-               will remove it later.  It is a placeholder for a
-               variable that is not to be included in the environment.  */
-            break;
-          if (*q == '=')
-            ok = 0;
-          p++, q++;
-        }
+        {
+          if (*q != *p)
+            break;
+          if (*q == 0)
+            /* The string is a lone variable name; keep it for now, we
+               will remove it later.  It is a placeholder for a
+               variable that is not to be included in the environment.  */
+            break;
+          if (*q == '=')
+            ok = 0;
+          p++, q++;
+        }
     }
   if (ok)
     *new_env++ = string;
@@ -1118,8 +1173,8 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
     new_length = 0;
 
     for (tem = Vprocess_environment;
-         CONSP (tem) && STRINGP (XCAR (tem));
-         tem = XCDR (tem))
+         CONSP (tem) && STRINGP (XCAR (tem));
+         tem = XCDR (tem))
       {
         if (strncmp (SSDATA (XCAR (tem)), "DISPLAY", 7) == 0
             && (SDATA (XCAR (tem)) [7] == '\0'
@@ -1172,11 +1227,11 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
     p = q = env;
     while (*p != 0)
       {
-        while (*q != 0 && strchr (*q, '=') == NULL)
-          q++;
-        *p = *q++;
-        if (*p != 0)
-          p++;
+        while (*q != 0 && strchr (*q, '=') == NULL)
+          q++;
+        *p = *q++;
+        if (*p != 0)
+          p++;
       }
   }
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 16a459bd62f..8e41be20505 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -34,26 +34,26 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static int
 emacs_gnutls_handle_error (gnutls_session_t, int err);
 
-Lisp_Object Qgnutls_log_level;
-Lisp_Object Qgnutls_code;
-Lisp_Object Qgnutls_anon, Qgnutls_x509pki;
-Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again,
+static Lisp_Object Qgnutls_log_level;
+static Lisp_Object Qgnutls_code;
+static Lisp_Object Qgnutls_anon, Qgnutls_x509pki;
+static Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again,
   Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake;
-int gnutls_global_initialized;
+static int gnutls_global_initialized;
 
 /* The following are for the property list of `gnutls-boot'.  */
-Lisp_Object Qgnutls_bootprop_priority;
-Lisp_Object Qgnutls_bootprop_trustfiles;
-Lisp_Object Qgnutls_bootprop_keyfiles;
-Lisp_Object Qgnutls_bootprop_callbacks;
-Lisp_Object Qgnutls_bootprop_loglevel;
-Lisp_Object Qgnutls_bootprop_hostname;
-Lisp_Object Qgnutls_bootprop_verify_flags;
-Lisp_Object Qgnutls_bootprop_verify_error;
-Lisp_Object Qgnutls_bootprop_verify_hostname_error;
+static Lisp_Object Qgnutls_bootprop_priority;
+static Lisp_Object Qgnutls_bootprop_trustfiles;
+static Lisp_Object Qgnutls_bootprop_keyfiles;
+static Lisp_Object Qgnutls_bootprop_callbacks;
+static Lisp_Object Qgnutls_bootprop_loglevel;
+static Lisp_Object Qgnutls_bootprop_hostname;
+static Lisp_Object Qgnutls_bootprop_verify_flags;
+static Lisp_Object Qgnutls_bootprop_verify_error;
+static Lisp_Object Qgnutls_bootprop_verify_hostname_error;
 
 /* Callback keys for `gnutls-boot'.  Unused currently.  */
-Lisp_Object Qgnutls_bootprop_callbacks_verify;
+static Lisp_Object Qgnutls_bootprop_callbacks_verify;
 
 static void
 gnutls_log_function (int level, const char* string)
@@ -490,7 +490,7 @@ one trustfile (usually a CA bundle).  */)
   /* callbacks          = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */
   loglevel              = Fplist_get (proplist, Qgnutls_bootprop_loglevel);
   verify_flags          = Fplist_get (proplist, Qgnutls_bootprop_verify_flags);
-  /* verify_error    = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */
+  /* verify_error       = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */
   verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error);
 
   if (!STRINGP (hostname))
@@ -918,4 +918,5 @@ syms_of_gnutls (void)
   defsubr (&Sgnutls_deinit);
   defsubr (&Sgnutls_bye);
 }
-#endif
+
+#endif /* HAVE_GNUTLS */
diff --git a/src/lisp.h b/src/lisp.h
index 76938a49ac4..bb3a8cc393c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3349,6 +3349,7 @@ extern void reset_sys_modes (struct tty_display_info *);
 extern void init_all_sys_modes (void);
 extern void reset_all_sys_modes (void);
 extern void wait_for_termination (int);
+extern void interruptible_wait_for_termination (int);
 extern void flush_pending_output (int);
 extern void child_setup_tty (int);
 extern void setup_pty (int);
diff --git a/src/sysdep.c b/src/sysdep.c
index 43f50cdb0a9..5ad3389dd8f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -296,11 +296,9 @@ init_baud_rate (int fd)
 int wait_debugging EXTERNALLY_VISIBLE;
 
 #ifndef MSDOS
-/* Wait for subprocess with process id `pid' to terminate and
-   make sure it will get eliminated (not remain forever as a zombie) */
 
-void
-wait_for_termination (int pid)
+static void
+wait_for_termination_1 (int pid, int interruptible)
 {
   while (1)
     {
@@ -339,9 +337,27 @@ wait_for_termination (int pid)
       sigsuspend (&empty_mask);
 #endif /* not WINDOWSNT */
 #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */
+      if (interruptible)
+        QUIT;
     }
 }
 
+/* Wait for subprocess with process id `pid' to terminate and
+   make sure it will get eliminated (not remain forever as a zombie) */
+
+void
+wait_for_termination (int pid)
+{
+  wait_for_termination_1 (pid, 0);
+}
+
+/* Like the above, but allow keyboard interruption. */
+void
+interruptible_wait_for_termination (int pid)
+{
+  wait_for_termination_1 (pid, 1);
+}
+
 /*
  *      flush any pending output
  *      (may flush input as well; it does not matter the way we use it)
@@ -1109,8 +1125,7 @@ tabs_safe_p (int fd)
 void
 get_tty_size (int fd, int *widthp, int *heightp)
 {
-
-#ifdef TIOCGWINSZ
+#if defined TIOCGWINSZ
 
   /* BSD-style.  */
   struct winsize size;
@@ -1123,8 +1138,7 @@ get_tty_size (int fd, int *widthp, int *heightp)
       *heightp = size.ws_row;
     }
 
-#else
-#ifdef TIOCGSIZE
+#elif defined TIOCGSIZE
 
   /* SunOS - style.  */
   struct ttysize size;
@@ -1137,16 +1151,28 @@ get_tty_size (int fd, int *widthp, int *heightp)
       *heightp = size.ts_lines;
     }
 
-#else
-#ifdef MSDOS
+#elif defined WINDOWSNT
+
+  CONSOLE_SCREEN_BUFFER_INFO info;
+  if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info))
+    {
+      *widthp = info.srWindow.Right - info.srWindow.Left + 1;
+      *heightp = info.srWindow.Bottom - info.srWindow.Top + 1;
+    }
+  else
+    *widthp = *heightp = 0;
+
+#elif defined MSDOS
+
   *widthp = ScreenCols ();
   *heightp = ScreenRows ();
+
 #else /* system doesn't know size */
+
   *widthp = 0;
   *heightp = 0;
+
 #endif
-#endif /* not SunOS-style */
-#endif /* not BSD-style */
 }
 
 /* Set the logical window size associated with descriptor FD