Sync to HEAD

[bpt/emacs.git] / src / process.h

diff --git a/src/process.h b/src/process.h
index bd52419..6e2641d 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -33,9 +33,6 @@ struct Lisp_Process
     Lisp_Object infd;
     /* Descriptor by which we write to this process */
     Lisp_Object outfd;
-    /* Descriptor for the tty which this process is using.
-       nil if we didn't record it (on some systems, there's no need).  */
-    Lisp_Object subtty;
     /* Name of subprocess terminal.  */
     Lisp_Object tty_name;
     /* Name of this process */
@@ -98,6 +95,24 @@ struct Lisp_Process
     /* Flag to set coding-system of the process buffer from the
        coding_system used to decode process output.  */
     Lisp_Object inherit_coding_system_flag;
+    /* Flat to decide the multibyteness of a string given to the
+       filter (if any).  It is initialized to the value of
+       `default-enable-multibyte-characters' when the process is
+       generated, and can be changed by the function
+       `set-process-fileter-multibyte'. */
+    Lisp_Object filter_multibyte;
+    /* Should we delay reading output from this process.
+       Initialized from `Vprocess_adaptive_read_buffering'.  */
+    Lisp_Object adaptive_read_buffering;
+    /* Hysteresis to try to read process output in larger blocks.
+       On some systems, e.g. the Linux kernel, emacs is seen as 
+       an interactive app also when reading process output, meaning
+       that process output can be read in as little as 1 byte at a
+       time.  Value is micro-seconds to delay reading output from
+       this process.  Range is 0 .. 50000.  */
+    Lisp_Object read_output_delay;
+    /* Skip reading this process on next read.  */
+    Lisp_Object read_output_skip;
 };
 
 /* Every field in the preceding structure except for the first two
@@ -121,6 +136,9 @@ extern int synch_process_alive;
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
 extern char *synch_process_death;
 
+/* Nonzero => this is the signal number that terminated the subprocess.  */
+extern int synch_process_termsig;
+
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
 extern int synch_process_retcode;
@@ -130,3 +148,6 @@ extern int synch_process_retcode;
 #ifndef NULL_DEVICE
 #define NULL_DEVICE "/dev/null"
 #endif
+
+/* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72
+   (do not change this comment) */