From: Noah Friedman <friedman@splode.com>
Date: Thu, 23 Oct 2008 06:55:14 +0000 (+0000)
Subject: (make_conversion_work_buffer): Check that Vcode_conversion_reused_workbuf
X-Git-Tag: emacs-pretest-23.0.90~2231
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=159bd5a226e5038c5133399212808b1fe09ec507;p=emacs.git

(make_conversion_work_buffer): Check that Vcode_conversion_reused_workbuf
is a live buffer, otherwise call Fget_buffer_create.
---

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;