masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 03:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Doc fix.

Browse source 
* 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.
This commit is contained in:
Xue Fuqiao 2013-11-05 17:00:52 +08:00
parent da6a8debb2
commit 29aa2b718c
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/ChangeLog
View file

@ -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> 2013-11-01 Jan Djärv <jan.h.d@swipnet.se>
* display.texi (Face Attributes): Document :distant-foreground. * display.texi (Face Attributes): Document :distant-foreground.

1
doc/lispref/display.texi
View file

@ -6112,6 +6112,7 @@ the standard display table.
@subsection Glyphs @subsection Glyphs
@cindex glyph @cindex glyph
@cindex glyph code
A @dfn{glyph} is a graphical symbol which occupies a single A @dfn{glyph} is a graphical symbol which occupies a single
character position on the screen. Each glyph is represented in Lisp character position on the screen. Each glyph is represented in Lisp
as a @dfn{glyph code}, which specifies a character and optionally a as a @dfn{glyph code}, which specifies a character and optionally a

5
src/ChangeLog
View file

@ -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> 2013-11-05 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (ns_get_name_from_ioreg): New function. * nsfns.m (ns_get_name_from_ioreg): New function.

6
src/xdisp.c
View file

@ -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 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. 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 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); Vglyphless_char_display = Fmake_char_table (Qglyphless_char_display, Qnil);
Fset_char_table_extra_slot (Vglyphless_char_display, make_number (0), Fset_char_table_extra_slot (Vglyphless_char_display, make_number (0),
Qempty_box); Qempty_box);