2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b9552eab25f..61827942c83 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * composite.c (fill_gstring_header): Fix copy/paste typo.
+
 2008-10-31  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (Fnext_window, Fprevious_window): Rewrite doc-string.
diff --git a/src/composite.c b/src/composite.c
index 9b3de0a615c..5f04c8ae8c6 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -810,7 +810,7 @@ fill_gstring_header (header, start, end, font_object, string)
   else
     {
       CHECK_STRING (string);
-      if (! STRING_MULTIBYTE (current_buffer->enable_multibyte_characters))
+      if (! STRING_MULTIBYTE (string))
         error ("Attempt to shape unibyte text");
       /* FROM and TO are checked by the caller.  */
       from = XINT (start);