1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f26d50f6ce9..973f9c1b2a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+        GLYPH_CODE_FACE returns EMACS_INT, not int.
+        * dispextern.h (merge_faces):
+        * xfaces.c (merge_faces):
+        * xdisp.c (get_next_display_element):
+        (next_element_from_display_vector): Don't assume EMACS_INT fits in int.
+
         * character.h (CHAR_VALID_P): Remove unused parameter.
         * fontset.c, lisp.h, xdisp.c: All uses changed.