aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2007-11-04 07:32:41 +0000
committerRichard M. Stallman2007-11-04 07:32:41 +0000
commita193ecf139c3a9876272385b68f31eb5f2d824d5 (patch)
tree7776c5666eef058963503574ab75a813c608482f /src
parentc69a28f1e6fe35ccac4848a4a7644fed1250afe3 (diff)
downloademacs-a193ecf139c3a9876272385b68f31eb5f2d824d5.tar.gz
emacs-a193ecf139c3a9876272385b68f31eb5f2d824d5.zip
(face_for_overlay_string): Function renamed from
face_at_buffer_position_no_overlays, and add arg OVERLAY.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index ef8842ac804..e405988704d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -7706,19 +7706,22 @@ face_at_buffer_position (w, pos, region_beg, region_end,
7706 return lookup_face (f, attrs, 0, NULL); 7706 return lookup_face (f, attrs, 0, NULL);
7707} 7707}
7708 7708
7709/* Return the face ID associated with buffer position POS for 7709/* Return the face ID at buffer position POS for displaying ASCII
7710 displaying ASCII characters, but without overlays. 7710 characters associated with overlay strings for overlay OVERLAY.
7711 Like face_at_buffer_position except it ignores overlays. */ 7711
7712 Like face_at_buffer_position except for OVERLAY. Currently it
7713 simply disregards the `face' properties of all overlays. */
7712 7714
7713int 7715int
7714face_at_buffer_position_no_overlays (w, pos, region_beg, region_end, 7716face_for_overlay_string (w, pos, region_beg, region_end,
7715 endptr, limit, mouse) 7717 endptr, limit, mouse, overlay)
7716 struct window *w; 7718 struct window *w;
7717 int pos; 7719 int pos;
7718 int region_beg, region_end; 7720 int region_beg, region_end;
7719 int *endptr; 7721 int *endptr;
7720 int limit; 7722 int limit;
7721 int mouse; 7723 int mouse;
7724 Lisp_Object overlay;
7722{ 7725{
7723 struct frame *f = XFRAME (w->frame); 7726 struct frame *f = XFRAME (w->frame);
7724 Lisp_Object attrs[LFACE_VECTOR_SIZE]; 7727 Lisp_Object attrs[LFACE_VECTOR_SIZE];