diff options
| author | Joakim Verona <joakim@verona.se> | 2015-01-27 20:38:56 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-01-27 20:38:56 +0100 |
| commit | 2a9de013720d8505369b42c7c110116ec822281f (patch) | |
| tree | be63a5b56d96c1b943311be2419064f5a2f387eb /src/dispextern.h | |
| parent | d464b0ee300a1919f4398195974396e3e3d66d57 (diff) | |
| parent | bd7a1e1564d04d7ea9c7f6587ffcf02ef8975512 (diff) | |
| download | emacs-2a9de013720d8505369b42c7c110116ec822281f.tar.gz | |
Merge branch 'master' into xwidget
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index bf0c2fc0a47..9ea64fb9f63 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3407,23 +3407,20 @@ char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object, #ifdef HAVE_WINDOW_SYSTEM void prepare_face_for_display (struct frame *, struct face *); #endif -int lookup_named_face (struct frame *, Lisp_Object, int); +int lookup_named_face (struct frame *, Lisp_Object, bool); int lookup_basic_face (struct frame *, int); int smaller_face (struct frame *, int, int); int face_with_height (struct frame *, int, int); -int lookup_derived_face (struct frame *, Lisp_Object, int, int); +int lookup_derived_face (struct frame *, Lisp_Object, int, bool); void init_frame_faces (struct frame *); void free_frame_faces (struct frame *); void recompute_basic_faces (struct frame *); -int face_at_buffer_position (struct window *w, ptrdiff_t pos, - ptrdiff_t *endptr, ptrdiff_t limit, - int mouse, int base_face_id); -int face_for_overlay_string (struct window *w, ptrdiff_t pos, - ptrdiff_t *endptr, ptrdiff_t limit, - int mouse, Lisp_Object overlay); -int face_at_string_position (struct window *w, Lisp_Object string, - ptrdiff_t pos, ptrdiff_t bufpos, - ptrdiff_t *endptr, enum face_id, int mouse); +int face_at_buffer_position (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t, + bool, int); +int face_for_overlay_string (struct window *, ptrdiff_t, ptrdiff_t *, ptrdiff_t, + bool, Lisp_Object); +int face_at_string_position (struct window *, Lisp_Object, ptrdiff_t, ptrdiff_t, + ptrdiff_t *, enum face_id, bool); int merge_faces (struct frame *, Lisp_Object, int, int); int compute_char_face (struct frame *, int, Lisp_Object); void free_all_realized_faces (Lisp_Object); |