[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-28 3fb69fad49: Fix documentation of 'glyphless-char-display'

From: Eli Zaretskii
Subject: emacs-28 3fb69fad49: Fix documentation of 'glyphless-char-display'
Date: Sat, 27 Aug 2022 03:52:16 -0400 (EDT)

branch: emacs-28
commit 3fb69fad492dd40279cf29c4d417cc86a8018cc7
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix documentation of 'glyphless-char-display'
    * src/xdisp.c (syms_of_xdisp)<glyphless-char-display>: Doc fix.
    (gui_produce_glyphs, lookup_glyphless_char_display): Fix
 src/xdisp.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 9740e6b590..a4881c4835 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7408,8 +7408,8 @@ lookup_glyphless_char_display (int c, struct it *it)
       if (c >= 0)
          glyphless_method = CHAR_TABLE_REF (Vglyphless_char_display, c);
-      if (CONSP (glyphless_method))
-       glyphless_method = FRAME_WINDOW_P (it->f)
+         if (CONSP (glyphless_method))
+           glyphless_method = FRAME_WINDOW_P (it->f)
              ? XCAR (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
             the method specified in the first extra slot of
             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,
                                   STRINGP (acronym) ? acronym : Qnil);
          goto done;
@@ -35821,14 +35821,15 @@ Each element, if non-nil, should be one of the 
   `empty-box':  display as an empty box
   `thin-space': display as 1-pixel width space
   `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
 display method for graphical terminals and text terminals respectively.
 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'.
+The char-table has one extra slot to control the display of characters for
+which no font is found on graphical terminals, and characters that cannot
+be displayed by text-mode terminals.  Its value should be an ASCII acronym
+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
 display table takes effect; in this case, Emacs does not consult

reply via email to

[Prev in Thread] Current Thread [Next in Thread]