diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-22 15:27:55 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-22 15:28:34 -0800 |
| commit | 27a0919cde7a6dce93aeba63b5ce7d0834f48531 (patch) | |
| tree | f190ea19340c561cfd48c8cdc47831b9e9ad1956 | |
| parent | bbbb038654eab73624a5d51faa52f2d3f5db14b5 (diff) | |
| download | emacs-27a0919cde7a6dce93aeba63b5ce7d0834f48531.tar.gz | |
Port recent xdisp.c fix to picky C compilers
* src/xdisp.c (dump_glyph): Redo the call to fprintf to avoid
putting #if inside the arguments to a standard function, which
the C standard says has undefined behavior.
| -rw-r--r-- | src/xdisp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 157fa729fcf..5185e777324 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -18827,12 +18827,11 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area) } else if (glyph->type == XWIDGET_GLYPH) { +#ifndef HAVE_XWIDGETS + eassume (false); +#else 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, @@ -18842,14 +18841,12 @@ 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, glyph->right_box_line_p); - +#endif } } |