Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-266
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-267
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-268
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-66
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-330

1 files changed, 5 insertions, 3 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index fbc816865b4..abcda4fc731 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -726,6 +726,11 @@ struct glyph_row
      position of the next row.  */
   struct display_pos end;
 
+  /* Non-zero means the overlay arrow bitmap is on this line.
+     -1 means use default overlay arrow bitmap, else
+     it specifies actual fringe bitmap number.  */
+  int overlay_arrow_bitmap;
+
   /* Left fringe bitmap number (enum fringe_bitmap_type).  */
   unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
 
@@ -764,9 +769,6 @@ struct glyph_row
   unsigned truncated_on_left_p : 1;
   unsigned truncated_on_right_p : 1;
 
-  /* 1 means the overlay arrow is on this line.  */
-  unsigned overlay_arrow_p : 1;
-
   /* 1 means that this row displays a continued line, i.e. it has a
      continuation mark at the right side.  */
   unsigned continued_p : 1;