diff options
| author | Miles Bader | 2006-07-19 00:42:56 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-07-19 00:42:56 +0000 |
| commit | 63db3c1b3ffa669435b10aa362115ef664990ab2 (patch) | |
| tree | a62f68b147d4265ce993136af897d4f348570594 /src/process.c | |
| parent | 2988d6b36d310ba98ea1fed570142f436804fc18 (diff) | |
| parent | 83676aa2e399363120942ef5ea19f8af6b75e8e8 (diff) | |
| download | emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.tar.gz emacs-63db3c1b3ffa669435b10aa362115ef664990ab2.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 343-356)
- Update from CVS
- Update for ERC 5.1.3.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 113-115)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index 2281f1ce3f6..45bf6446644 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5158,7 +5158,7 @@ read_process_output (proc, channel) | |||
| 5158 | #endif | 5158 | #endif |
| 5159 | /* But do it only if the caller is actually going to read events. | 5159 | /* But do it only if the caller is actually going to read events. |
| 5160 | Otherwise there's no need to make him wake up, and it could | 5160 | Otherwise there's no need to make him wake up, and it could |
| 5161 | cause trouble (for example it would make Fsit_for return). */ | 5161 | cause trouble (for example it would make sit_for return). */ |
| 5162 | if (waiting_for_user_input_p == -1) | 5162 | if (waiting_for_user_input_p == -1) |
| 5163 | record_asynch_buffer_change (); | 5163 | record_asynch_buffer_change (); |
| 5164 | 5164 | ||
| @@ -6595,7 +6595,7 @@ exec_sentinel (proc, reason) | |||
| 6595 | #endif | 6595 | #endif |
| 6596 | /* But do it only if the caller is actually going to read events. | 6596 | /* But do it only if the caller is actually going to read events. |
| 6597 | Otherwise there's no need to make him wake up, and it could | 6597 | Otherwise there's no need to make him wake up, and it could |
| 6598 | cause trouble (for example it would make Fsit_for return). */ | 6598 | cause trouble (for example it would make sit_for return). */ |
| 6599 | if (waiting_for_user_input_p == -1) | 6599 | if (waiting_for_user_input_p == -1) |
| 6600 | record_asynch_buffer_change (); | 6600 | record_asynch_buffer_change (); |
| 6601 | 6601 | ||