[Emacs-diffs] /srv/bzr/emacs/trunk r100081: Don't burp if process sentinel/filter kills the current buffer.

[Stefan Monnier]

------------------------------------------------------------
revno: 100081
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-29 10:29:09 -0400
message:
  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.
modified:
  src/ChangeLog
  src/process.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-29 14:23:12 +0000
+++ b/src/ChangeLog     2010-04-29 14:29:09 +0000
@@ -1,5 +1,8 @@
 2010-04-29  Stefan Monnier  <address@hidden>
 
+       * process.c (read_process_output, exec_sentinel): Don't burp if the
+       sentinel/filter kills the current buffer (bug#6060).
+
        Fix wrong-docstring problem introduced with hash-consing.  (Bug#6008)
        * eval.c (Fautoload): Set doc to a unique number rather than to 0.
        Remove unused var `args'.

=== modified file 'src/process.c'
--- a/src/process.c     2010-04-13 02:07:48 +0000
+++ b/src/process.c     2010-04-29 14:29:09 +0000
@@ -5396,7 +5396,7 @@
   /* There's no good reason to let process filters change the current
      buffer, and many callers of accept-process-output, sit-for, and
      friends don't expect current-buffer to be changed from under them.  */
-  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+  record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
 
   /* Read and dispose of the process output.  */
   outstream = p->filter;
@@ -6814,7 +6814,7 @@
   /* There's no good reason to let sentinels change the current
      buffer, and many callers of accept-process-output, sit-for, and
      friends don't expect current-buffer to be changed from under them.  */
-  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+  record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
 
   sentinel = p->sentinel;
   if (NILP (sentinel))