summaryrefslogtreecommitdiff
path: root/src/xdisp.c
diff options
context:
space:
mode:
authorXue Fuqiao <xfq.free@gmail.com>2013-11-05 17:00:52 +0800
committerXue Fuqiao <xfq.free@gmail.com>2013-11-05 17:00:52 +0800
commit29aa2b718c072c78d0fda78ae40b0a0d2e32bdbd (patch)
tree7b8ab33c783a1983cfe9f0cd6927d3ee721f4680 /src/xdisp.c
parentda6a8debb270a2e602f3b789ec3e27e815041164 (diff)
Doc fix.
* doc/lispref/display.texi (Glyphs): Add an index for glyph code. * src/xdisp.c (syms_of_xdisp): Mention the active display table in doc string of glyphless-char-display.
Diffstat (limited to 'src/xdisp.c')
-rw-r--r--src/xdisp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 382f9e7a8e..a9dd387729 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);