diff options
| author | Stefan Monnier | 2010-04-29 10:29:09 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-04-29 10:29:09 -0400 |
| commit | d2630aefd3b7b9b543dad2bb2f352238da67a933 (patch) | |
| tree | 947e632087df165b9047ab876ad37ccd27be259a /src/process.c | |
| parent | f9dddf52913e213f85dac43fecad6620462f408d (diff) | |
| download | emacs-d2630aefd3b7b9b543dad2bb2f352238da67a933.tar.gz emacs-d2630aefd3b7b9b543dad2bb2f352238da67a933.zip | |
Don't burp if process sentinel/filter kills the current buffer.
* process.c (read_process_output, exec_sentinel): Don't burp if the
sentinel/filter kills the current buffer.
Fixes: debbugs:6060
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 7e8f4cc57bc..29983b22858 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -5396,7 +5396,7 @@ read_process_output (proc, channel) | |||
| 5396 | /* There's no good reason to let process filters change the current | 5396 | /* There's no good reason to let process filters change the current |
| 5397 | buffer, and many callers of accept-process-output, sit-for, and | 5397 | buffer, and many callers of accept-process-output, sit-for, and |
| 5398 | friends don't expect current-buffer to be changed from under them. */ | 5398 | friends don't expect current-buffer to be changed from under them. */ |
| 5399 | record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); | 5399 | record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); |
| 5400 | 5400 | ||
| 5401 | /* Read and dispose of the process output. */ | 5401 | /* Read and dispose of the process output. */ |
| 5402 | outstream = p->filter; | 5402 | outstream = p->filter; |
| @@ -6814,7 +6814,7 @@ exec_sentinel (proc, reason) | |||
| 6814 | /* There's no good reason to let sentinels change the current | 6814 | /* There's no good reason to let sentinels change the current |
| 6815 | buffer, and many callers of accept-process-output, sit-for, and | 6815 | buffer, and many callers of accept-process-output, sit-for, and |
| 6816 | friends don't expect current-buffer to be changed from under them. */ | 6816 | friends don't expect current-buffer to be changed from under them. */ |
| 6817 | record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); | 6817 | record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ()); |
| 6818 | 6818 | ||
| 6819 | sentinel = p->sentinel; | 6819 | sentinel = p->sentinel; |
| 6820 | if (NILP (sentinel)) | 6820 | if (NILP (sentinel)) |