1 files changed, 5 insertions, 0 deletions

diff --git a/src/process.c b/src/process.c
index 69cd0d99c8a..4a1f31f66e7 100644
--- 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;