procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix documentation of 'glyphless-char-display'

Browse source 
* src/xdisp.c (syms_of_xdisp)<glyphless-char-display>: Doc fix.
(gui_produce_glyphs, lookup_glyphless_char_display): Fix
indentation.
This commit is contained in:
Eli Zaretskii 2022-08-27 10:50:57 +03:00
parent e3b8577525
commit 3fb69fad49
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/xdisp.c
View file

@ -7408,8 +7408,8 @@ lookup_glyphless_char_display (int c, struct it *it)
if (c >= 0) if (c >= 0)
{ {
glyphless_method = CHAR_TABLE_REF (Vglyphless_char_display, c); glyphless_method = CHAR_TABLE_REF (Vglyphless_char_display, c);
if (CONSP (glyphless_method)) if (CONSP (glyphless_method))
glyphless_method = FRAME_WINDOW_P (it->f) glyphless_method = FRAME_WINDOW_P (it->f)
? XCAR (glyphless_method) ? XCAR (glyphless_method)
: XCDR (glyphless_method); : XCDR (glyphless_method);
} }
@ -30546,9 +30546,9 @@ gui_produce_glyphs (struct it *it)
/* When no suitable font is found, display this character by /* When no suitable font is found, display this character by
the method specified in the first extra slot of the method specified in the first extra slot of
Vglyphless_char_display. */ Vglyphless_char_display. */
Lisp_Object acronym = lookup_glyphless_char_display (-1, it); Lisp_Object acronym = lookup_glyphless_char_display (-1, it);
eassert (it->what == IT_GLYPHLESS); eassert (it->what == IT_GLYPHLESS);
produce_glyphless_glyph (it, true, produce_glyphless_glyph (it, true,
STRINGP (acronym) ? acronym : Qnil); STRINGP (acronym) ? acronym : Qnil);
goto done; goto done;
@ -35821,14 +35821,15 @@ Each element, if non-nil, should be one of the following:
`empty-box': display as an empty box `empty-box': display as an empty box
`thin-space': display as 1-pixel width space `thin-space': display as 1-pixel width space
`zero-width': don't display `zero-width': don't display
Any other value is interpreted as `empty-box'.
An element may also be a cons cell (GRAPHICAL . TEXT), which specifies the An element may also be a cons cell (GRAPHICAL . TEXT), which specifies the
display method for graphical terminals and text terminals respectively. display method for graphical terminals and text terminals respectively.
GRAPHICAL and TEXT should each have one of the values listed above. 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 characters for
which no font is found. This slot only takes effect on graphical terminals. which no font is found on graphical terminals, and characters that cannot
Its value should be an ASCII acronym string, `hex-code', `empty-box', or be displayed by text-mode terminals. Its value should be an ASCII acronym
`thin-space'. The default is `empty-box'. string, `hex-code', `empty-box', or `thin-space'. The default is `hex-code'.
If a character has a non-nil entry in an active display table, the 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 display table takes effect; in this case, Emacs does not consult