[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 9b7d9c0 04/13: trailing whitespace, better ifdef o
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget 9b7d9c0 04/13: trailing whitespace, better ifdef of xwidget code |
Date: |
Fri, 02 Jan 2015 12:22:37 +0000 |
branch: xwidget
commit 9b7d9c08c0ba278c2cafc9a14f9e872f7a80e002
Author: jave <address@hidden>
Commit: jave <address@hidden>
trailing whitespace, better ifdef of xwidget code
---
src/dispextern.h | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/dispextern.h b/src/dispextern.h
index 908b62b..1a33e96 100644
--- 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
- [Emacs-diffs] xwidget updated (4423b6a -> c089503), Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 9b7d9c0 04/13: trailing whitespace, better ifdef of xwidget code,
Joakim Verona <=
- [Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 2cef979 07/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 6d1cade 06/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 79030ea 08/13: whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget e93fd42 10/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 659a0a5 11/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 1048722 03/13: Doc strings, and whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget c089503 13/13: moved xwidget test to the test dir, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget fe27c32 12/13: a missing merge, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 8f0cf0a 01/13: removed msysconfig.sh, Joakim Verona, 2015/01/02