mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 11:50:51 -08:00
Code Issues Projects Releases Wiki Activity

(make_conversion_work_buffer): Check that Vcode_conversion_reused_workbuf

Browse source 
is a live buffer, otherwise call Fget_buffer_create.
This commit is contained in:
Noah Friedman 2008-10-23 06:55:14 +00:00
parent 49f9c34447
commit 159bd5a226
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2008-10-23 Noah Friedman <friedman@splode.com>
* coding.c (make_conversion_work_buffer): Check that
Vcode_conversion_reused_workbuf is a live buffer, otherwise call
Fget_buffer_create.
2008-10-23 Kenichi Handa <handa@m17n.org> 2008-10-23 Kenichi Handa <handa@m17n.org>
* font.c (font_add_log): Check the values of extra properties. * font.c (font_add_log): Check the values of extra properties.

6
src/coding.c
View file

@ -1345,12 +1345,12 @@ decode_coding_utf_8 (coding)
src = src_base; src = src_base;
else else
{ {
ONE_MORE_BYTE (c2); ONE_MORE_BYTE (c2);
if (! UTF_8_EXTRA_OCTET_P (c2)) if (! UTF_8_EXTRA_OCTET_P (c2))
src = src_base; src = src_base;
else else
{ {
ONE_MORE_BYTE (c3); ONE_MORE_BYTE (c3);
if (! UTF_8_EXTRA_OCTET_P (c3)) if (! UTF_8_EXTRA_OCTET_P (c3))
src = src_base; src = src_base;
else else
@ -6982,7 +6982,7 @@ make_conversion_work_buffer (multibyte)
} }
else else
{ {
if (NILP (Vcode_conversion_reused_workbuf)) if (NILP (Fbuffer_live_p (Vcode_conversion_reused_workbuf)))
Vcode_conversion_reused_workbuf Vcode_conversion_reused_workbuf
= Fget_buffer_create (Vcode_conversion_workbuf_name); = Fget_buffer_create (Vcode_conversion_workbuf_name);
workbuf = Vcode_conversion_reused_workbuf; workbuf = Vcode_conversion_reused_workbuf;