X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/cbf21103d9fad16fe87d9affbc955c75cce657e4..91c85b706282144564f8bc805129babe4ffe5a3a:/src/dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index 02b9df08eb..ef66006cc0 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -397,7 +397,7 @@ struct glyph
       unsigned automatic : 1;
       /* ID of the composition.  */
       unsigned id    : 23;
-      /* Start and end indices of glyhs of the composition.  */
+      /* Start and end indices of glyphs of the composition.  */
       unsigned from : 4;
       unsigned to : 4;
     } cmp;
@@ -1867,9 +1867,11 @@ struct composition_it
   int id;
   /* If non-negative, character that triggers the automatic
      composition at `stop_pos', and this is an automatic compositoin.
-     If negative, this is a static composition..  */
+     If negative, this is a static composition.  This is set to -2
+     temporarily if searching of composition reach a limit or a
+     newline.  */
   int ch;
-  /* If this an automatic composition, how many charaters to look back
+  /* If this an automatic composition, how many characters to look back
      from the position where a character triggering the composition
      exists.  */
   int lookback;
@@ -2040,9 +2042,9 @@ struct it
     unsigned avoid_cursor_p : 1;
 
     /* properties from display property that are reset by another display property. */
+    short voffset;
     Lisp_Object space_width;
     Lisp_Object font_height;
-    short voffset;
   }
   stack[IT_STACK_SIZE];
 
@@ -2067,8 +2069,6 @@ struct it
      where the `^' can be replaced by a display table entry.  */
   unsigned ctl_arrow_p : 1;
 
-  enum line_wrap_method line_wrap;
-
   /* Non-zero means that the current face has a box.  */
   unsigned face_box_p : 1;
 
@@ -2104,6 +2104,8 @@ struct it
      descent/ascent (line-height property).  Reset after this glyph.  */
   unsigned constrain_row_ascent_descent_p : 1;
 
+  enum line_wrap_method line_wrap;
+
   /* The ID of the default face to use.  One of DEFAULT_FACE_ID,
      MODE_LINE_FACE_ID, etc, depending on what we are displaying.  */
   int base_face_id;
@@ -2138,6 +2140,9 @@ struct it
   /* Computed from the value of the `raise' property.  */
   short voffset;
 
+  /* Number of columns per \t.  */
+  short tab_width;
+
   /* Value of the `height' property, if any; nil if none.  */
   Lisp_Object font_height;
 
@@ -2148,9 +2153,6 @@ struct it
   Lisp_Object object;
   struct text_pos position;
 
-  /* Number of columns per \t.  */
-  short tab_width;
-
   /* Width in pixels of truncation and continuation glyphs.  */
   short truncation_pixel_width, continuation_pixel_width;