* process.c (exec_sentinel): Preserve current-buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6f0e2a73ccfa76594723edb0293d9002fd71fc7d..92a05505d9154d9083bb5412af2b552cd41eb359 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * process.c (exec_sentinel): Preserve current-buffer.
+
        * process.c (read_process_output): Move the save-current-buffer to
        apply to both the filter and the non-filter branches.
 

diff --git a/src/process.c b/src/process.c
index 69cd0d99c8a150bc98ea6bd7c1dfbfbd7ff27e0f..4a1f31f66e7d96fe80859529993a19c15cf4ad4f 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -6840,6 +6840,11 @@ exec_sentinel (proc, reason)
   XSETBUFFER (obuffer, current_buffer);
   okeymap = current_buffer->keymap;
 
+  /* 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 ());
+
   sentinel = p->sentinel;
   if (NILP (sentinel))
     return;