diff options
| author | Miles Bader | 2005-03-31 09:58:14 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-03-31 09:58:14 +0000 |
| commit | 773415d9340f12db3bd8654de5014deec57d49b7 (patch) | |
| tree | 579ecf466891c80df147934b0db24cb89d0abe3d /src/process.c | |
| parent | e9d5a4e18a8955cf60e78c54a511fd8e1259716f (diff) | |
| parent | 7c315e1cff9019c8af55921fab6f571e68b09623 (diff) | |
| download | emacs-773415d9340f12db3bd8654de5014deec57d49b7.tar.gz emacs-773415d9340f12db3bd8654de5014deec57d49b7.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 206-222)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 45-52)
- Update from CVS
- Update from CVS: texi Makefile.in CVS keyw cruft
- Update from CVS: ChangeLog tweaks
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/process.c b/src/process.c index 8ce21f3e8ee..26d40c26cd5 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Asynchronous subprocess control for GNU Emacs. | 1 | /* Asynchronous subprocess control for GNU Emacs. |
| 2 | Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 98, 1999, | 2 | Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1998, 1999, |
| 3 | 2001, 2002, 2003, 2004 Free Software Foundation, Inc. | 3 | 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -376,8 +376,6 @@ extern int timers_run; | |||
| 376 | /* Maximum number of bytes to send to a pty without an eof. */ | 376 | /* Maximum number of bytes to send to a pty without an eof. */ |
| 377 | static int pty_max_bytes; | 377 | static int pty_max_bytes; |
| 378 | 378 | ||
| 379 | extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system; | ||
| 380 | |||
| 381 | #ifdef HAVE_PTYS | 379 | #ifdef HAVE_PTYS |
| 382 | #ifdef HAVE_PTY_H | 380 | #ifdef HAVE_PTY_H |
| 383 | #include <pty.h> | 381 | #include <pty.h> |