diff options
| author | Jan D | 2015-04-26 13:55:01 +0200 |
|---|---|---|
| committer | Jan D | 2015-04-26 13:55:01 +0200 |
| commit | f92ac2e82ed199d6f25d2a59508e08addb1150ac (patch) | |
| tree | d7d7756e3dbce10d8f73c27815d815499f78c2bd /src/process.h | |
| parent | 5a094119ce79723108abd90a1fcc33721e964823 (diff) | |
| parent | a40869789fc5502e3d4e393b7c31d78cb7f29aa1 (diff) | |
| download | emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.tar.gz emacs-f92ac2e82ed199d6f25d2a59508e08addb1150ac.zip | |
Merge branch 'master' into cairo
Diffstat (limited to 'src/process.h')
| -rw-r--r-- | src/process.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/process.h b/src/process.h index 36979dcac9e..e889055dc23 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -105,6 +105,9 @@ struct Lisp_Process | |||
| 105 | Lisp_Object gnutls_cred_type; | 105 | Lisp_Object gnutls_cred_type; |
| 106 | #endif | 106 | #endif |
| 107 | 107 | ||
| 108 | /* Pipe process attached to the standard error of this process. */ | ||
| 109 | Lisp_Object stderrproc; | ||
| 110 | |||
| 108 | /* After this point, there are no Lisp_Objects any more. */ | 111 | /* After this point, there are no Lisp_Objects any more. */ |
| 109 | /* alloc.c assumes that `pid' is the first such non-Lisp slot. */ | 112 | /* alloc.c assumes that `pid' is the first such non-Lisp slot. */ |
| 110 | 113 | ||