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

[Kim F . Storm]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.191 emacs/src/dispextern.h:1.192
*** emacs/src/dispextern.h:1.191        Sun Jan  9 02:05:04 2005
--- emacs/src/dispextern.h      Mon Jan 10 13:30:46 2005
***************
*** 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;
--- 2760,2766 ----
                                 int, int));
  int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
                                 int, int *, enum face_id, int));
! int merge_faces 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;