diff options
| author | Karoly Lorentey | 2006-04-10 14:52:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-04-10 14:52:24 +0000 |
| commit | e349ae3b6b6db99d11321622fadff88bc42c1125 (patch) | |
| tree | 7a24a5dad70d4b3695f227681fc37e179551d24a /src/process.h | |
| parent | 2518de51d20e848711c712f5030e8c207a4e2840 (diff) | |
| parent | 4f07f2e8a5458758dcf2bfbdf9b0cf8c91a8572e (diff) | |
| download | emacs-e349ae3b6b6db99d11321622fadff88bc42c1125.tar.gz emacs-e349ae3b6b6db99d11321622fadff88bc42c1125.zip | |
Merged from
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-188
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-189
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-190
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-191
Undo incorrect merge of etc/images/README from Gnus 5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-192
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-193
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-194
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-195
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-196
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-197
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-198
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-199
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-200
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-201
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-202
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-203
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-204
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-205
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-206
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-73
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-74
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-75
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-76
Update from CVS: README: Addition from 5.10.6 tar ball.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-77
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-78
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-79
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-80
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-547
Diffstat (limited to 'src/process.h')
| -rw-r--r-- | src/process.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/process.h b/src/process.h index 9625556888c..c4b4281fedf 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -51,8 +51,6 @@ struct Lisp_Process | |||
| 51 | Lisp_Object log; | 51 | Lisp_Object log; |
| 52 | /* Buffer that output is going to */ | 52 | /* Buffer that output is going to */ |
| 53 | Lisp_Object buffer; | 53 | Lisp_Object buffer; |
| 54 | /* Number of this process */ | ||
| 55 | Lisp_Object pid; | ||
| 56 | /* t if this is a real child process. | 54 | /* t if this is a real child process. |
| 57 | For a net connection, it is a plist based on the arguments to make-network-process. */ | 55 | For a net connection, it is a plist based on the arguments to make-network-process. */ |
| 58 | Lisp_Object childp; | 56 | Lisp_Object childp; |
| @@ -63,10 +61,6 @@ struct Lisp_Process | |||
| 63 | /* Non-nil means kill silently if Emacs is exited. | 61 | /* Non-nil means kill silently if Emacs is exited. |
| 64 | This is the inverse of the `query-on-exit' flag. */ | 62 | This is the inverse of the `query-on-exit' flag. */ |
| 65 | Lisp_Object kill_without_query; | 63 | Lisp_Object kill_without_query; |
| 66 | /* Record the process status in the raw form in which it comes from `wait'. | ||
| 67 | This is to avoid consing in a signal handler. */ | ||
| 68 | Lisp_Object raw_status_low; | ||
| 69 | Lisp_Object raw_status_high; | ||
| 70 | /* Symbol indicating status of process. | 64 | /* Symbol indicating status of process. |
| 71 | This may be a symbol: run, open, or closed. | 65 | This may be a symbol: run, open, or closed. |
| 72 | Or it may be a list, whose car is stop, exit or signal | 66 | Or it may be a list, whose car is stop, exit or signal |
| @@ -112,6 +106,19 @@ struct Lisp_Process | |||
| 112 | Lisp_Object read_output_delay; | 106 | Lisp_Object read_output_delay; |
| 113 | /* Skip reading this process on next read. */ | 107 | /* Skip reading this process on next read. */ |
| 114 | Lisp_Object read_output_skip; | 108 | Lisp_Object read_output_skip; |
| 109 | |||
| 110 | /* After this point, there are no Lisp_Objects any more. */ | ||
| 111 | |||
| 112 | /* Number of this process. | ||
| 113 | allocate_process assumes this is the first non-Lisp_Object field. | ||
| 114 | A value 0 is used for pseudo-processes such as network connections. */ | ||
| 115 | pid_t pid; | ||
| 116 | /* Record the process status in the raw form in which it comes from `wait'. | ||
| 117 | This is to avoid consing in a signal handler. The `raw_status_new' | ||
| 118 | flag indicates that `raw_status' contains a new status that still | ||
| 119 | needs to be synced to `status'. */ | ||
| 120 | int raw_status_new : 1; | ||
| 121 | int raw_status; | ||
| 115 | }; | 122 | }; |
| 116 | 123 | ||
| 117 | /* Every field in the preceding structure except for the first two | 124 | /* Every field in the preceding structure except for the first two |