diff options
| author | Karoly Lorentey | 2006-07-14 05:56:32 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-07-14 05:56:32 +0000 |
| commit | 99715bbc447eb633e45ffa23b87284771ce3ac74 (patch) | |
| tree | 3a8a53dfe3dbdd9f8e36965e9f043eae522d3c0e /src/process.c | |
| parent | 556b89447234f15d1784a23dadbfe429464463a8 (diff) | |
| parent | 763bb2d43615bc3ae816422f965d76d5e1ae4bdd (diff) | |
| download | emacs-99715bbc447eb633e45ffa23b87284771ce3ac74.tar.gz emacs-99715bbc447eb633e45ffa23b87284771ce3ac74.zip | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-331
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-332
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-333
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-334
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-335
Add note about "link" button-class to etc/TODO
* emacs@sv.gnu.org/emacs--devo--0--patch-336
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-337
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-338
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-339
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-340
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-341
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-342
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-343
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-344
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-345
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-346
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-347
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-348
Update for ERC 5.1.3.
* emacs@sv.gnu.org/emacs--devo--0--patch-349
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-350
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/gnus--rel--5.10--patch-111
Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-112
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-113
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-114
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572
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 965b33c52c3..9dadc1ab4ab 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5165,7 +5165,7 @@ read_process_output (proc, channel) | |||
| 5165 | #endif | 5165 | #endif |
| 5166 | /* But do it only if the caller is actually going to read events. | 5166 | /* But do it only if the caller is actually going to read events. |
| 5167 | Otherwise there's no need to make him wake up, and it could | 5167 | Otherwise there's no need to make him wake up, and it could |
| 5168 | cause trouble (for example it would make Fsit_for return). */ | 5168 | cause trouble (for example it would make sit_for return). */ |
| 5169 | if (waiting_for_user_input_p == -1) | 5169 | if (waiting_for_user_input_p == -1) |
| 5170 | record_asynch_buffer_change (); | 5170 | record_asynch_buffer_change (); |
| 5171 | 5171 | ||
| @@ -6612,7 +6612,7 @@ exec_sentinel (proc, reason) | |||
| 6612 | #endif | 6612 | #endif |
| 6613 | /* But do it only if the caller is actually going to read events. | 6613 | /* But do it only if the caller is actually going to read events. |
| 6614 | Otherwise there's no need to make him wake up, and it could | 6614 | Otherwise there's no need to make him wake up, and it could |
| 6615 | cause trouble (for example it would make Fsit_for return). */ | 6615 | cause trouble (for example it would make sit_for return). */ |
| 6616 | if (waiting_for_user_input_p == -1) | 6616 | if (waiting_for_user_input_p == -1) |
| 6617 | record_asynch_buffer_change (); | 6617 | record_asynch_buffer_change (); |
| 6618 | 6618 | ||