comparison src/process.c @ 3510:b4a552ca4e99

(read_process_output): Deactivate the mark. Save and restore Vdeactivate_mark.

3509:a1ef317ceb18

    {
      /* We inhibit quit here instead of just catching it so that 
	 hitting ^G when a filter happens to be running won't screw
	 it up.  */
      int count = specpdl_ptr - specpdl;
      specbind (Qinhibit_quit, Qt);
      call2 (outstream, proc, make_string (chars, nchars));

#ifdef VMS
      start_vms_process_read (vs);
#endif
      unbind_to (count);
      return nchars;

  /* If no filter, write into buffer if it isn't dead.  */
  if (!NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name))
    {
      Lisp_Object old_read_only;
      Lisp_Object old_begv, old_zv;

      Fset_buffer (p->buffer);
      opoint = point;
      old_read_only = current_buffer->read_only;
      XFASTINT (old_begv) = BEGV;

      update_mode_lines++;

      /* If the restriction isn't what it should be, set it.  */
      if (XFASTINT (old_begv) != BEGV || XFASTINT (old_zv) != ZV)
	Fnarrow_to_region (old_begv, old_zv);

      current_buffer->read_only = old_read_only;
      SET_PT (opoint);
      set_buffer_internal (old);
    }

3510:b4a552ca4e99

    {
      /* We inhibit quit here instead of just catching it so that 
	 hitting ^G when a filter happens to be running won't screw
	 it up.  */
      int count = specpdl_ptr - specpdl;
      Lisp_Object odeactivate;

      odeactivate = Vdeactivate_mark;

      specbind (Qinhibit_quit, Qt);
      call2 (outstream, proc, make_string (chars, nchars));

      /* Deactivate the mark now, so it doesn't happen
	 *after* the following command.  */
      if (!NILP (current_buffer->mark_active))
	{
	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
	    {
	      current_buffer->mark_active = Qnil;
	      call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
	    }
	}
      Vdeactivate_mark = odeactivate;

#ifdef VMS
      start_vms_process_read (vs);
#endif
      unbind_to (count);
      return nchars;

  /* If no filter, write into buffer if it isn't dead.  */
  if (!NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name))
    {
      Lisp_Object old_read_only;
      Lisp_Object old_begv, old_zv;
      Lisp_Object odeactivate;

      odeactivate = Vdeactivate_mark;

      Fset_buffer (p->buffer);
      opoint = point;
      old_read_only = current_buffer->read_only;
      XFASTINT (old_begv) = BEGV;

      update_mode_lines++;

      /* If the restriction isn't what it should be, set it.  */
      if (XFASTINT (old_begv) != BEGV || XFASTINT (old_zv) != ZV)
	Fnarrow_to_region (old_begv, old_zv);

      /* Deactivate the mark now, so it doesn't happen
	 *after* the following command.  */
      if (!NILP (current_buffer->mark_active))
	{
	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
	    {
	      current_buffer->mark_active = Qnil;
	      call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
	    }
	}

      Vdeactivate_mark = odeactivate;

      current_buffer->read_only = old_read_only;
      SET_PT (opoint);
      set_buffer_internal (old);
    }