Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / process.h

diff --git a/src/process.h b/src/process.h
index 5d5f9d5b616023f77d91da0e01039603ec548cd7..cadc9b7031c38ea86d73cdea7736744de3371d06 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -1,5 +1,6 @@
 /* Definitions for asynchronous process control in GNU Emacs.
-   Copyright (C) 1985, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,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
-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.  */
 
 
 /* This structure records information about a subprocess
@@ -99,7 +100,6 @@ struct Lisp_Process
        generated, and can be changed by the function
        `set-process-fileter-multibyte'. */
     Lisp_Object filter_multibyte;
-#ifdef ADAPTIVE_READ_BUFFERING
     /* Should we delay reading output from this process.
        Initialized from `Vprocess_adaptive_read_buffering'.  */
     Lisp_Object adaptive_read_buffering;
@@ -112,7 +112,6 @@ struct Lisp_Process
     Lisp_Object read_output_delay;
     /* Skip reading this process on next read.  */
     Lisp_Object read_output_skip;
-#endif
 };
 
 /* Every field in the preceding structure except for the first two