trailing whitespace, better ifdef of xwidget code

diff --git a/src/dispextern.h b/src/dispextern.h
index 908b62b5995d37251dcad75a091a001010dc8438..1a33e9654cf2d5b08fe18c7136b5fdf436e94997 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -347,11 +347,11 @@ enum glyph_type
   IMAGE_GLYPH,
 
   /* Glyph is a space of fractional width and/or height.  */
-  STRETCH_GLYPH,
+  STRETCH_GLYPH
 #ifdef HAVE_XWIDGETS
   /* Glyph is an external widget drawn by the GUI toolkit.   */
-  XWIDGET_GLYPH
-#endif  
+  ,XWIDGET_GLYPH
+#endif
 };
 
 
@@ -506,7 +506,7 @@ struct glyph
 
 #ifdef HAVE_XWIDGETS
     struct xwidget* xwidget;
-#endif    
+#endif
     /* Sub-structure for type == STRETCH_GLYPH.  */
     struct
     {
@@ -1361,7 +1361,7 @@ struct glyph_string
   /* Image, if any.  */
   struct image *img;
 
-#ifdef HAVE_XWIDGETS  
+#ifdef HAVE_XWIDGETS
   struct xwidget* xwidget;
 #endif
   /* Slice */
@@ -2107,10 +2107,10 @@ enum display_element_type
   IT_TRUNCATION,
 
   /* Continuation glyphs.  See the comment for IT_TRUNCATION.  */
-  IT_CONTINUATION,
+  IT_CONTINUATION
 
-#ifdef HAVE_XWIDGETS  
-  IT_XWIDGET
+#ifdef HAVE_XWIDGETS
+  ,IT_XWIDGET
 #endif
 };
 
@@ -2177,7 +2177,7 @@ enum it_method {
   GET_FROM_STRETCH,
 #ifdef HAVE_XWIDGETS
   GET_FROM_XWIDGET,
-#endif  
+#endif
   NUM_IT_METHODS
 };
 
@@ -2530,7 +2530,7 @@ struct it
   /* If what == IT_IMAGE, the id of the image to display.  */
   ptrdiff_t image_id;
 
-#ifdef HAVE_XWIDGETS  
+#ifdef HAVE_XWIDGETS
   /* If what == IT_XWIDGET*/
   struct xwidget* xwidget;
 #endif