(fill_gstring_header): Fix copy/paste typo.

diff --git a/src/ChangeLog b/src/ChangeLog
index b9552eab25fb61c8771580b62db26a48cdd10673..61827942c83e79f41c07b9367692638ea25cfdd0 100644 (file)
--- 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 9b3de0a615c3a021bde4874526e1bad25e7eeb9b..5f04c8ae8c6ca1c3206243d5fc051579e0fc0d62 100644 (file)
--- 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);