Avoid crash on composition (backport from trunk).

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index fcaff20..7cfb3aa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-11  Johan Bockgård  <bojohan@gnu.org>
+
+       * xdisp.c (fill_composite_glyph_string): Always set s->face, to
+       avoid a crash (bug#9496).
+
 2012-01-09  Chong Yidong  <cyd@gnu.org>
 
        * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.