comparison src/coding.c @ 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 d4659edb9b7b
children c457d1e5edff
comparison
equal deleted inserted replaced
99073:2955f4db2183 99074:10cd979d05ca
1343 ONE_MORE_BYTE (c1); 1343 ONE_MORE_BYTE (c1);
1344 if (! UTF_8_3_OCTET_LEADING_P (c1)) 1344 if (! UTF_8_3_OCTET_LEADING_P (c1))
1345 src = src_base; 1345 src = src_base;
1346 else 1346 else
1347 { 1347 {
1348 ONE_MORE_BYTE (c2); 1348 ONE_MORE_BYTE (c2);
1349 if (! UTF_8_EXTRA_OCTET_P (c2)) 1349 if (! UTF_8_EXTRA_OCTET_P (c2))
1350 src = src_base; 1350 src = src_base;
1351 else 1351 else
1352 { 1352 {
1353 ONE_MORE_BYTE (c3); 1353 ONE_MORE_BYTE (c3);
1354 if (! UTF_8_EXTRA_OCTET_P (c3)) 1354 if (! UTF_8_EXTRA_OCTET_P (c3))
1355 src = src_base; 1355 src = src_base;
1356 else 1356 else
1357 { 1357 {
1358 if ((c1 != UTF_8_BOM_1) 1358 if ((c1 != UTF_8_BOM_1)
6980 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil); 6980 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
6981 workbuf = Fget_buffer_create (name); 6981 workbuf = Fget_buffer_create (name);
6982 } 6982 }
6983 else 6983 else
6984 { 6984 {
6985 if (NILP (Vcode_conversion_reused_workbuf)) 6985 if (NILP (Fbuffer_live_p (Vcode_conversion_reused_workbuf)))
6986 Vcode_conversion_reused_workbuf 6986 Vcode_conversion_reused_workbuf
6987 = Fget_buffer_create (Vcode_conversion_workbuf_name); 6987 = Fget_buffer_create (Vcode_conversion_workbuf_name);
6988 workbuf = Vcode_conversion_reused_workbuf; 6988 workbuf = Vcode_conversion_reused_workbuf;
6989 } 6989 }
6990 current = current_buffer; 6990 current = current_buffer;