diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-11-05 17:00:52 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-11-05 17:00:52 +0800 |
| commit | 29aa2b718c072c78d0fda78ae40b0a0d2e32bdbd (patch) | |
| tree | 7b8ab33c783a1983cfe9f0cd6927d3ee721f4680 | |
| parent | da6a8debb270a2e602f3b789ec3e27e815041164 (diff) | |
| download | emacs-29aa2b718c072c78d0fda78ae40b0a0d2e32bdbd.tar.gz emacs-29aa2b718c072c78d0fda78ae40b0a0d2e32bdbd.tar.bz2 emacs-29aa2b718c072c78d0fda78ae40b0a0d2e32bdbd.zip | |
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.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index cc214aa6dfa..5b945c6d06e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2013-11-05 Xue Fuqiao <xfq.free@gmail.com> + + * display.texi (Glyphs): Add an index for glyph code. + 2013-11-01 Jan Djärv <jan.h.d@swipnet.se> * display.texi (Face Attributes): Document :distant-foreground. diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index ebb61a76b59..36d8502fe9e 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -6112,6 +6112,7 @@ the standard display table. @subsection Glyphs @cindex glyph +@cindex glyph code A @dfn{glyph} is a graphical symbol which occupies a single character position on the screen. Each glyph is represented in Lisp as a @dfn{glyph code}, which specifies a character and optionally a 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); |