diff options
| author | Miles Bader | 2007-08-13 13:48:35 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:48:35 +0000 |
| commit | b2e6b10fe2d40020a75ab0025af98a4abf339cd2 (patch) | |
| tree | db265e5ea93cdc13f8e3b54ed5c7ad2869d50ec9 /src/callproc.c | |
| parent | 905350bef3ebc514a418658dd155c1d062664b56 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.tar.gz emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index ecc8643f630..d86113cfdba 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -117,7 +117,7 @@ Lisp_Object Vprocess_environment; | |||
| 117 | Lisp_Object Qbuffer_file_type; | 117 | Lisp_Object Qbuffer_file_type; |
| 118 | #endif /* DOS_NT */ | 118 | #endif /* DOS_NT */ |
| 119 | 119 | ||
| 120 | /* True iff we are about to fork off a synchronous process or if we | 120 | /* True if we are about to fork off a synchronous process or if we |
| 121 | are waiting for it. */ | 121 | are waiting for it. */ |
| 122 | int synch_process_alive; | 122 | int synch_process_alive; |
| 123 | 123 | ||