mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-19 14:41:11 -08:00
Code Issues Projects Releases Wiki Activity

(Finsert_file_contents): Call Fcheck_coding_system

Browse source 
before calling setup_coding_system so that autoloading of a coding
system work.
This commit is contained in:
Kenichi Handa 2005-03-11 11:59:42 +00:00
parent ac249c4c50
commit 87e3d54cf9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/fileio.c
View file

@ -4503,12 +4503,12 @@ actually used. */)
this way, we can run Lisp program safely before decoding
the inserted text. */
Lisp_Object unwind_data;
int count = SPECPDL_INDEX ();
int count = SPECPDL_INDEX ();
unwind_data = Fcons (current_buffer->enable_multibyte_characters,
Fcons (current_buffer->undo_list,
Fcurrent_buffer ()));
current_buffer->enable_multibyte_characters = Qnil;
current_buffer->enable_multibyte_characters = Qnil;
current_buffer->undo_list = Qt;
record_unwind_protect (decide_coding_unwind, unwind_data);
@ -4530,7 +4530,6 @@ actually used. */)
if (CONSP (coding_systems))
val = XCAR (coding_systems);
}
unbind_to (count, Qnil);
inserted = Z_BYTE - BEG_BYTE;
}
@ -4541,7 +4540,7 @@ actually used. */)
on some system. */
{
struct coding_system temp_coding;
setup_coding_system (val, &temp_coding);
setup_coding_system (Fcheck_coding_system (val), &temp_coding);
bcopy (&temp_coding, &coding, sizeof coding);
}
/* Ensure we set Vlast_coding_system_used. */