(struct composition): Change types of members; glyph_len to unsigned,

width to unsigned short.

diff --git a/src/ChangeLog b/src/ChangeLog
index b0a9505..14e557e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
 2001-03-09  Kenichi Handa  <handa@etl.go.jp>
 
-       * composite.h: Change types of members; glyph_len to unsigned,
-       width to unsigned short.
+       * composite.h (struct composition): Change types of members;
+       glyph_len to unsigned, width to unsigned short.
 
 2001-03-08  Andrew Innes  <andrewi@gnu.org>
 

diff --git a/src/composite.h b/src/composite.h
index 7c7236e..75a336d 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -149,17 +149,17 @@ extern Lisp_Object composition_temp;
    ID, and thus share the same instance of this structure.  */
 
 struct composition {
-  /* How many columns the overall glyphs occupy on the screen.  This
-     gives an approximate value for column calculation in
-     Fcurrent_column, and etc.  */
-  unsigned char width;
-
   /* Number of glyphs of the composition components.  */
-  unsigned char glyph_len;
+  unsigned glyph_len;
 
   /* Width, ascent, and descent pixels of the composition.  */
   short pixel_width, ascent, descent;
 
+  /* How many columns the overall glyphs occupy on the screen.  This
+     gives an approximate value for column calculation in
+     Fcurrent_column, and etc.  */
+  unsigned short width;
+
   /* Method of the composition.  */
   enum composition_method method;