Mercurial > emacs

comparison src/dispextern.h @ 59456:08a75ace96a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(merge_faces): Rename from merge_into_realized_face.
author Kim F. Storm <storm@cua.dk>
date Mon, 10 Jan 2005 13:30:46 +0000
parents 6aee7f43ad59
children d4cb255b034d cb67264d6096
comparison
equal deleted inserted replaced
59455:e024e6716c4a 59456:08a75ace96a6
2758 void recompute_basic_faces P_ ((struct frame *)); 2758 void recompute_basic_faces P_ ((struct frame *));
2759 int face_at_buffer_position P_ ((struct window *, int, int, int, int *, 2759 int face_at_buffer_position P_ ((struct window *, int, int, int, int *,
2760 int, int)); 2760 int, int));
2761 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int, 2761 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
2762 int, int *, enum face_id, int)); 2762 int, int *, enum face_id, int));
2763 int merge_into_realized_face P_ ((struct frame *, Lisp_Object, 2763 int merge_faces P_ ((struct frame *, Lisp_Object, int, int));
2764 int, int));
2765 int compute_char_face P_ ((struct frame *, int, Lisp_Object)); 2764 int compute_char_face P_ ((struct frame *, int, Lisp_Object));
2766 void free_all_realized_faces P_ ((Lisp_Object)); 2765 void free_all_realized_faces P_ ((Lisp_Object));
2767 extern Lisp_Object Qforeground_color, Qbackground_color; 2766 extern Lisp_Object Qforeground_color, Qbackground_color;
2768 extern char unspecified_fg[], unspecified_bg[]; 2767 extern char unspecified_fg[], unspecified_bg[];
2769 void free_realized_multibyte_face P_ ((struct frame *, int)); 2768 void free_realized_multibyte_face P_ ((struct frame *, int));