Merge from mainline.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f109718fadb..7d63e76c309 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -65,6 +65,16 @@
         alignof(EMACS_INT) < sizeof (EMACS_INT).
         (check_sblock, check_string_bytes, check_string_free_list): Protoize.
 
+2011-04-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (lookup_glyphless_char_display)
+        (produce_glyphless_glyph): Handle cons cell entry in
+        glyphless-char-display.
+        (Vglyphless_char_display): Document it.
+
+        * term.c (produce_glyphless_glyph): Handle cons cell entry in
+        glyphless-char-display.
+
 2011-04-17  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (get_next_display_element): Remove unnecessary ifdefs.