mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-20 20:50:53 -08:00
(run_pre_post_conversion_on_str): Save and restore Vdeactivate_mark.
This commit is contained in:
parent
5eba27ea0d
commit
cf3b32fcfb
1 changed files with 6 additions and 2 deletions
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue