aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2007-11-03 03:46:57 +0000
committerRichard M. Stallman2007-11-03 03:46:57 +0000
commit490943fe146878558e7e123b0fe7ded4b8df6384 (patch)
tree78a36cb33b3ca33c4795315a05c1ce141a0cf08d /src
parent03e1d617913b11ba869e43ac65e801f6c34a8974 (diff)
downloademacs-490943fe146878558e7e123b0fe7ded4b8df6384.tar.gz
emacs-490943fe146878558e7e123b0fe7ded4b8df6384.zip
(face_at_buffer_position_no_overlays): Add decl.
Diffstat (limited to 'src')
-rw-r--r--src/dispextern.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 9e899f9ccb2..c59403b0205 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1808,6 +1808,9 @@ struct it_slice
1808 Lisp_Object height; 1808 Lisp_Object height;
1809}; 1809};
1810 1810
1811/* Input sources for fetching characters or data to display.
1812 The input source is found in the `method' field. */
1813
1811enum it_method { 1814enum it_method {
1812 GET_FROM_BUFFER = 0, 1815 GET_FROM_BUFFER = 0,
1813 GET_FROM_DISPLAY_VECTOR, 1816 GET_FROM_DISPLAY_VECTOR,
@@ -2856,6 +2859,9 @@ void free_frame_faces P_ ((struct frame *));
2856void recompute_basic_faces P_ ((struct frame *)); 2859void recompute_basic_faces P_ ((struct frame *));
2857int face_at_buffer_position P_ ((struct window *, int, int, int, int *, 2860int face_at_buffer_position P_ ((struct window *, int, int, int, int *,
2858 int, int)); 2861 int, int));
2862int face_at_buffer_position_no_overlays P_ ((struct window *, int, int,
2863 int, int *,
2864 int, int));
2859int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int, 2865int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
2860 int, int *, enum face_id, int)); 2866 int, int *, enum face_id, int));
2861int merge_faces P_ ((struct frame *, Lisp_Object, int, int)); 2867int merge_faces P_ ((struct frame *, Lisp_Object, int, int));