emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs-25 5221f45: Fix the build with --enable-checking=gly


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-25 5221f45: Fix the build with --enable-checking=glyphs
Date: Fri, 22 Jan 2016 21:14:36 +0000

branch: emacs-25
commit 5221f45047507d7306211b8df064a89b2f1706fa
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix the build with --enable-checking=glyphs
    
    * src/xdisp.c (dump_glyph): Don't refer to glyph->u.xwidget in a
    build without xwidget support.
---
 src/xdisp.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index bba475f..157fa72 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18828,7 +18828,11 @@ dump_glyph (struct glyph_row *row, struct glyph 
*glyph, int area)
   else if (glyph->type == XWIDGET_GLYPH)
     {
       fprintf (stderr,
+#ifdef HAVE_XWIDGETS
               "  %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
+#else
+              "  %5d %4c %6d %c %3d %c %4d %1.1d%1.1d\n",
+#endif
               glyph - row->glyphs[TEXT_AREA],
               'X',
               glyph->charpos,
@@ -18838,7 +18842,9 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, 
int area)
                   ? 'S'
                   : '-')),
               glyph->pixel_width,
+#ifdef HAVE_XWIDGETS
               glyph->u.xwidget,
+#endif
               '.',
               glyph->face_id,
               glyph->left_box_line_p,



reply via email to

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