comparison src/coding.c @ 47632:551472d77d2a

(run_pre_post_conversion_on_str): Save and restore Vdeactivate_mark.

47631:433ae412d00f

     Lisp_Object str;
     struct coding_system *coding;
     int encodep;
{
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1;
  int multibyte = STRING_MULTIBYTE (str);
  Lisp_Object buffer;
  struct buffer *buf;

  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
  record_unwind_protect (code_convert_region_unwind, Qnil);
  GCPRO1 (str);

  buffer = Fget_buffer_create (build_string (" *code-converting-work*"));
  buf = XBUFFER (buffer);

  buf->directory = current_buffer->directory;

    {
      TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
      call1 (coding->post_read_conversion, make_number (Z - BEG));
    }
  inhibit_pre_post_conversion = 0;
  str = make_buffer_string (BEG, Z, 1);
  return unbind_to (count, str);
}

Lisp_Object

47632:551472d77d2a

     Lisp_Object str;
     struct coding_system *coding;
     int encodep;
{
  int count = SPECPDL_INDEX ();
  struct gcpro gcpro1, gcpro2;
  int multibyte = STRING_MULTIBYTE (str);
  Lisp_Object buffer;
  struct buffer *buf;
  Lisp_Object old_deactivate_mark;

  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
  record_unwind_protect (code_convert_region_unwind, Qnil);
  /* It is not crucial to specbind this.  */
  old_deactivate_mark = Vdeactivate_mark;
  GCPRO2 (str, old_deactivate_mark);

  buffer = Fget_buffer_create (build_string (" *code-converting-work*"));
  buf = XBUFFER (buffer);

  buf->directory = current_buffer->directory;

    {
      TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
      call1 (coding->post_read_conversion, make_number (Z - BEG));
    }
  inhibit_pre_post_conversion = 0;
  Vdeactivate_mark = old_deactivate_mark;
  str = make_buffer_string (BEG, Z, 1);
  return unbind_to (count, str);
}

Lisp_Object