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

[Kim F . Storm]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.190 emacs/src/dispextern.h:1.191
*** emacs/src/dispextern.h:1.190        Sat Jan  1 01:34:39 2005
--- emacs/src/dispextern.h      Sun Jan  9 02:05:04 2005
***************
*** 1847,1852 ****
--- 1847,1855 ----
       means that no such character is involved.  */
    int dpvec_char_len;
  
+   /* Face id to use for all characters in display vector.  -1 if unused. */
+   int dpvec_face_id;
+ 
    /* Face id of the iterator saved in case a glyph from dpvec contains
       a face.  The face is restored when all glyphs from dpvec have
       been delivered.  */
***************
*** 2757,2762 ****
--- 2760,2767 ----
                                 int, int));
  int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
                                 int, int *, enum face_id, int));
+ int merge_into_realized_face P_ ((struct frame *, Lisp_Object,
+                                            int, int));
  int compute_char_face P_ ((struct frame *, int, Lisp_Object));
  void free_all_realized_faces P_ ((Lisp_Object));
  extern Lisp_Object Qforeground_color, Qbackground_color;