2 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 227b86a4cab..556025fa5bd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-05  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * xdisp.c (syms_of_xdisp): Mention the active display table in doc
+        string of glyphless-char-display.
+
 2013-11-05  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsfns.m (ns_get_name_from_ioreg): New function.
diff --git a/src/xdisp.c b/src/xdisp.c
index 382f9e7a8e1..a9dd387729e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29723,7 +29723,11 @@ GRAPHICAL and TEXT should each have one of the values listed above.
 The char-table has one extra slot to control the display of a character for
 which no font is found.  This slot only takes effect on graphical terminals.
 Its value should be an ASCII acronym string, `hex-code', `empty-box', or
-`thin-space'.  The default is `empty-box'.  */);
+`thin-space'.  The default is `empty-box'.
+
+If a character has a non-nil entry in an active display table, the
+display table takes effect; in this case, Emacs does not consult
+`glyphless-char-display' at all.  */);
   Vglyphless_char_display = Fmake_char_table (Qglyphless_char_display, Qnil);
   Fset_char_table_extra_slot (Vglyphless_char_display, make_number (0),
                               Qempty_box);