aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney <[email protected]>2008-06-25 21:46:49 +0000
committerJason Rumney <[email protected]>2008-06-25 21:46:49 +0000
commitccedd25934d7e68a2dc7d1c75b2ed57ed56b03cd (patch)
treeb1602c7e777bbcf62ca46f4c2723db1290aca80f /src
parent603a09371b98d0da42936f2294eb62f1ad1aaa9a (diff)
(get_glyph_face_and_encoding): Encode invalid glyphs as 0.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6916e152d3..c2664909f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-25 Jason Rumney <[email protected]>
+
+ * xdisp.c (get_glyph_face_and_encoding): Encode invalid glyphs as 0.
+
2008-06-25 Stefan Monnier <[email protected]>
* bytecode.c (Fbyte_code): Disable debugging code that doesn't compile.
diff --git a/src/xdisp.c b/src/xdisp.c
index ab8a9315e8..ad2de16c7b 100644
--- 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. */