Mercurial > emacs
changeset 99074:10cd979d05ca
(make_conversion_work_buffer): Check that Vcode_conversion_reused_workbuf
is a live buffer, otherwise call Fget_buffer_create.
author | Noah Friedman <friedman@splode.com> |
---|---|
date | Thu, 23 Oct 2008 06:55:14 +0000 |
parents | 2955f4db2183 |
children | 3172ff476053 |
files | src/ChangeLog src/coding.c |
diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Oct 23 04:02:19 2008 +0000 +++ b/src/ChangeLog Thu Oct 23 06:55:14 2008 +0000 @@ -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> * font.c (font_add_log): Check the values of extra properties.
--- a/src/coding.c Thu Oct 23 04:02:19 2008 +0000 +++ b/src/coding.c Thu Oct 23 06:55:14 2008 +0000 @@ -1345,12 +1345,12 @@ src = src_base; else { - ONE_MORE_BYTE (c2); + ONE_MORE_BYTE (c2); if (! UTF_8_EXTRA_OCTET_P (c2)) src = src_base; else { - ONE_MORE_BYTE (c3); + ONE_MORE_BYTE (c3); if (! UTF_8_EXTRA_OCTET_P (c3)) src = src_base; else @@ -6982,7 +6982,7 @@ } else { - if (NILP (Vcode_conversion_reused_workbuf)) + if (NILP (Fbuffer_live_p (Vcode_conversion_reused_workbuf))) Vcode_conversion_reused_workbuf = Fget_buffer_create (Vcode_conversion_workbuf_name); workbuf = Vcode_conversion_reused_workbuf;