(get_glyph_face_and_encoding): Encode invalid glyphs as 0.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6916e152d334e940217a48c617d3868d756f15fa..c2664909f8a6fac538da04c636d4d09c655ba057 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-25  Jason Rumney  <jasonr@gnu.org>
+
+        * xdisp.c (get_glyph_face_and_encoding): Encode invalid glyphs as 0.
+
 2008-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * bytecode.c (Fbyte_code): Disable debugging code that doesn't compile.

diff --git a/src/xdisp.c b/src/xdisp.c
index ab8a9315e851e1d17edfac36b8220aa4852bd97d..ad2de16c7b58fcc147763fdb71493f929a9c53f6 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19349,7 +19349,7 @@ get_glyph_face_and_encoding (f, glyph, char2b, two_byte_p)
       if (code != FONT_INVALID_CODE)
        STORE_XCHAR2B (char2b, (code >> 8), (code & 0xFF));
       else
-       STORE_XCHAR2B (char2b, 0, code);
+       STORE_XCHAR2B (char2b, 0, 0);
     }
 
   /* Make sure X resources of the face are allocated.  */