Commit cf3b32fc authored by Richard M. Stallman's avatar Richard M. Stallman

(run_pre_post_conversion_on_str): Save and restore Vdeactivate_mark.

parent 5eba27ea
......@@ -5815,14 +5815,17 @@ run_pre_post_conversion_on_str (str, coding, encodep)
int encodep;
{
int count = SPECPDL_INDEX ();
struct gcpro gcpro1;
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);
GCPRO1 (str);
/* 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);
......@@ -5853,6 +5856,7 @@ run_pre_post_conversion_on_str (str, coding, encodep)
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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment