diff options
| author | Noah Friedman <friedman@splode.com> | 2008-10-23 06:55:14 +0000 |
|---|---|---|
| committer | Noah Friedman <friedman@splode.com> | 2008-10-23 06:55:14 +0000 |
| commit | 159bd5a226e5038c5133399212808b1fe09ec507 (patch) | |
| tree | 92fc87b370007863d79bd6e24603f19b9099e9b7 | |
| parent | 49f9c344472822b5366df3f71cf2e2adb5433def (diff) | |
| download | emacs-159bd5a226e5038c5133399212808b1fe09ec507.tar.gz emacs-159bd5a226e5038c5133399212808b1fe09ec507.tar.bz2 emacs-159bd5a226e5038c5133399212808b1fe09ec507.zip | |
(make_conversion_work_buffer): Check that Vcode_conversion_reused_workbuf
is a live buffer, otherwise call Fget_buffer_create.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/coding.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 09cd14012ad..19caf803042 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/coding.c b/src/coding.c index ea0a066eb71..9c617a3f8e4 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1345,12 +1345,12 @@ decode_coding_utf_8 (coding) 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 @@ make_conversion_work_buffer (multibyte) } 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; |