[Emacs-diffs] Changes to emacs/src/dispextern.h [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.153.4.6 emacs/src/dispextern.h:1.153.4.7
*** emacs/src/dispextern.h:1.153.4.6    Wed Sep 29 07:22:18 2004
--- emacs/src/dispextern.h      Thu Sep 30 01:20:35 2004
***************
*** 104,110 ****
  };
  
  /* Number of bits allocated to store fringe bitmap numbers.  */
! #define FRINGE_ID_BITS  8
  
  
  
--- 104,110 ----
  };
  
  /* Number of bits allocated to store fringe bitmap numbers.  */
! #define FRINGE_ID_BITS  16
  
  
  
***************
*** 714,737 ****
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
  
-   /* Face of the left fringe glyph.  */
-   unsigned left_user_fringe_face_id : FACE_ID_BITS;
- 
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
  
-   /* Face of the right fringe glyph.  */
-   unsigned right_user_fringe_face_id : FACE_ID_BITS;
- 
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_fringe_bitmap : FRINGE_ID_BITS;
  
-   /* Face of the left fringe glyph.  */
-   unsigned left_fringe_face_id : FACE_ID_BITS;
- 
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Face of the right fringe glyph.  */
    unsigned right_fringe_face_id : FACE_ID_BITS;
  
--- 714,737 ----
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_fringe_bitmap : FRINGE_ID_BITS;
  
+   /* Face of the left fringe glyph.  */
+   unsigned left_user_fringe_face_id : FACE_ID_BITS;
+ 
+   /* Face of the right fringe glyph.  */
+   unsigned right_user_fringe_face_id : FACE_ID_BITS;
+ 
+   /* Face of the left fringe glyph.  */
+   unsigned left_fringe_face_id : FACE_ID_BITS;
+ 
    /* Face of the right fringe glyph.  */
    unsigned right_fringe_face_id : FACE_ID_BITS;
  
***************
*** 2041,2052 ****
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
  
-   /* Face of the left fringe glyph.  */
-   unsigned left_user_fringe_face_id : FACE_ID_BITS;
- 
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Face of the right fringe glyph.  */
    unsigned right_user_fringe_face_id : FACE_ID_BITS;
  };
--- 2041,2052 ----
    /* Left fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
  
    /* Right fringe bitmap number (enum fringe_bitmap_type).  */
    unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
  
+   /* Face of the left fringe glyph.  */
+   unsigned left_user_fringe_face_id : FACE_ID_BITS;
+ 
    /* Face of the right fringe glyph.  */
    unsigned right_user_fringe_face_id : FACE_ID_BITS;
  };
***************
*** 2634,2640 ****
  
  /* Defined in fringe.c */
  
! int valid_fringe_bitmap_p (Lisp_Object);
  void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
  void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
  void draw_window_fringes P_ ((struct window *));
--- 2634,2640 ----
  
  /* Defined in fringe.c */
  
! int lookup_fringe_bitmap (Lisp_Object);
  void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
  void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
  void draw_window_fringes P_ ((struct window *));