From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 22 Jan 2016 23:27:55 +0000 (-0800)
Subject: Port recent xdisp.c fix to picky C compilers
X-Git-Tag: emacs-25.0.90~86
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/27a0919cde7a6dce93aeba63b5ce7d0834f48531

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.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 157fa729fc..5185e77732 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
     }
 }