comparison src/process.c @ 7454:8d9e41a175fa

(exec_sentinel): Don't deactivate the mark. Check for asynch buffer switch.

7453:9b14642f7d52

static void
exec_sentinel (proc, reason)
     Lisp_Object proc, reason;
{
  Lisp_Object sentinel;
  register struct Lisp_Process *p = XPROCESS (proc);
  int count = specpdl_ptr - specpdl;

  sentinel = p->sentinel;
  if (NILP (sentinel))
    return;

  /* Zilch the sentinel while it's running, to avoid recursive invocations;

  p->sentinel = Qnil;
  record_unwind_protect (exec_sentinel_unwind, Fcons (proc, sentinel));
  /* Inhibit quit so that random quits don't screw up a running filter.  */
  specbind (Qinhibit_quit, Qt);
  call2 (sentinel, proc, reason);
  if (waiting_for_user_input_p)
    prepare_menu_bars ();
  unbind_to (count, Qnil);
}

7454:8d9e41a175fa

static void
exec_sentinel (proc, reason)
     Lisp_Object proc, reason;
{
  Lisp_Object sentinel, obuffer, odeactivate;
  register struct Lisp_Process *p = XPROCESS (proc);
  int count = specpdl_ptr - specpdl;

  odeactivate = Vdeactivate_mark;
  obuffer = Fcurrent_buffer ();
  sentinel = p->sentinel;
  if (NILP (sentinel))
    return;

  /* Zilch the sentinel while it's running, to avoid recursive invocations;

  p->sentinel = Qnil;
  record_unwind_protect (exec_sentinel_unwind, Fcons (proc, sentinel));
  /* Inhibit quit so that random quits don't screw up a running filter.  */
  specbind (Qinhibit_quit, Qt);
  call2 (sentinel, proc, reason);

  Vdeactivate_mark = odeactivate;
  if (! EQ (Fcurrent_buffer (), obuffer))
    record_asynch_buffer_change ();

  if (waiting_for_user_input_p)
    prepare_menu_bars ();
  unbind_to (count, Qnil);
}